diff options
| author | Adrian Roos <roosa@google.com> | 2016-10-25 22:17:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-25 22:17:05 +0000 |
| commit | 65bee562c0ca221603bc1174c803265f3251f442 (patch) | |
| tree | b8ecb701b56a5a6e834a1574afe3294b9dd33e38 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | f3ea02119b832f114a297d2c8ca9e883fd82488e (diff) | |
| parent | 0d280c5a52e3794e0c73e5284f1d6bb21adb6d07 (diff) | |
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am: db1fd054d2 -s ours am: 299b57410d -s ours
am: 0d280c5a52 -s ours
Change-Id: I6198082bc0dce2cccb7818e08e027e1df493ae1b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions