| commit | 5e325a21c93bd193753931057c34ebd740446a14 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Jul 14 20:52:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 20:52:19 2014 +0000 |
| tree | 3dc5aaa74f1272c357d339c3c61d7e1ed0aececf | |
| parent | b846dc3716d4575c9f01ebadc6e38d818217c49e [diff] | |
| parent | 9940c8cd488c5e7f60c8a964187962962ba12db1 [diff] |
am 9940c8cd: am ec6d674c: am cf16ca16: am dac3f4af: Merge "Whitelist another exception during dex2oat resolving." * commit '9940c8cd488c5e7f60c8a964187962962ba12db1':