| commit | 4c52615b3ba841dc759023b4cde5336bca60137c | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Jul 14 19:22:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 19:22:26 2014 +0000 |
| tree | 7369d1deb42107decc58c177821939f24a884268 | |
| parent | 16a433aaeaf2d0eb8c10f46ff8a4ada521656c33 [diff] | |
| parent | a684b0edda6fa9307a970a6a3efcd6372265d1a7 [diff] |
am a684b0ed: am 9152d407: am dac3f4af: Merge "Whitelist another exception during dex2oat resolving." * commit 'a684b0edda6fa9307a970a6a3efcd6372265d1a7':