diff options
| author | 2013-11-12 18:19:05 +0000 | |
|---|---|---|
| committer | 2013-11-12 18:19:05 +0000 | |
| commit | b46815a4bcea74287847f631aeefb4c74dfc862f (patch) | |
| tree | 7c5988bf1a9c9a1ddeb7c9acc4cd0bc729a8e4df /compiler/driver/compiler_driver.cc | |
| parent | 25724efbf84cce5734d1869e636cf59bc3f95941 (diff) | |
| parent | d5aba599561d8d14bb8c19fd633bfcd05af3c264 (diff) | |
Merge changes If1f62dff,I3cf59d56 into dalvik-dev
* changes:
Fix CTS failures caused by ignoring malformed dex files in dex2oat
Revert "resolved conflicts for merge of ad93c622 to master"
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
0 files changed, 0 insertions, 0 deletions