| commit | 49f036295cdfa0cf1e2a04fda2ffe68138140e47 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Jul 14 20:13:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 20:13:50 2014 +0000 |
| tree | 3dc5aaa74f1272c357d339c3c61d7e1ed0aececf | |
| parent | c7bd364a31522606f10589d791273bcd15548f4e [diff] | |
| parent | 4c52615b3ba841dc759023b4cde5336bca60137c [diff] |
am 4c52615b: am a684b0ed: am 9152d407: am dac3f4af: Merge "Whitelist another exception during dex2oat resolving." * commit '4c52615b3ba841dc759023b4cde5336bca60137c':