| commit | 005dd97e20fee4f8e56d839698d198942ddd80ad | [log] [tgz] |
|---|---|---|
| author | Richard Uhler <ruhler@google.com> | Fri Apr 03 18:05:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 03 18:05:58 2015 +0000 |
| tree | 90fbeac8abf73fb9c15be0d89bc01d2572b69626 | |
| parent | a99c70f38afe71c3c3a45a040fb5fa9c098bbd95 [diff] | |
| parent | b31e64121154735c6b0057f4ab2987efedbb62c1 [diff] |
am b31e6412: am b2d4768e: Merge "Store OatDexFile instead of OatFile in DexFile." * commit 'b31e64121154735c6b0057f4ab2987efedbb62c1': Store OatDexFile instead of OatFile in DexFile.