| commit | 686d6f3bf7a22bdc5e676a5e735bfaef314f4de8 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Nov 12 13:47:07 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 12 13:47:07 2013 -0800 |
| tree | 0d08e9e3a965e6d5ad029644259b759b35e63502 | |
| parent | de230447c96230b1ca87d82c0876f13cb7fb5855 [diff] | |
| parent | f22ca3459d8585c4d2b6b2eaaf9b67f56b4042c7 [diff] |
am f22ca345: resolved conflicts for merge of 5f20cf36 to master * commit 'f22ca3459d8585c4d2b6b2eaaf9b67f56b4042c7': Fix CTS failures caused by ignoring malformed dex files in dex2oat