diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-02-22 19:31:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-22 19:31:32 +0000 |
| commit | ab4d62929412556b90f8927fb05602d2e630518c (patch) | |
| tree | 16eace3fc7a76b749ff7c9df5869bc42cbabcf56 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 83fd156e2173ff65fd8afdaca1ccd20fc91a5d33 (diff) | |
| parent | d201f486871e825e713ae0df2f2f01e3dfff94d8 (diff) | |
Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev
am: d201f48687 -s ours
* commit 'd201f486871e825e713ae0df2f2f01e3dfff94d8':
DO NOT MERGE ANYWHERE: Hack to get devices booting again.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions