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