| commit | b46815a4bcea74287847f631aeefb4c74dfc862f | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Nov 12 18:19:05 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 12 18:19:05 2013 +0000 |
| tree | 7c5988bf1a9c9a1ddeb7c9acc4cd0bc729a8e4df | |
| 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"