diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-02-22 19:56:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-22 19:56:20 +0000 |
| commit | 43c452eea8cf60fd2319aa43257783ab4bf7f515 (patch) | |
| tree | 8736c2fb2ce4fe516797bb80f0976a85b148e4b0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 209d706d2b5965d189a532edc0e70f75be4e0141 (diff) | |
| parent | 202fbf2c34cee4d3b66fd26dec7f49259ef638b5 (diff) | |
Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev am: d201f48687 -s ours am: ab4d629294 -s ours
am: 202fbf2c34 -s ours
* commit '202fbf2c34cee4d3b66fd26dec7f49259ef638b5':
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