| commit | 2f846b39bc50bca8c4a5762bd9a53dfe3db5d023 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Sat Nov 09 09:26:55 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Nov 09 09:26:55 2013 -0800 |
| tree | 3d5384f39e26adb963ae8c7cafbbc0fabbedaef0 | |
| parent | 9ea110f11e5ceaacd98ae17a95f183578786a649 [diff] | |
| parent | 4f6a77d529ae295630e22d4636c2acc2ba2fbb6d [diff] |
am 4f6a77d5: resolved conflicts for merge of ad93c622 to master * commit '4f6a77d529ae295630e22d4636c2acc2ba2fbb6d': Ignore missing files in dex2oat