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