diff options
author | Kevin Hufnagle <khufnagle@google.com> | 2016-08-04 02:12:26 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-04 02:12:26 +0000 |
commit | 25b9724575275e330a1426328a500eebc4c05866 (patch) | |
tree | 7d08ced8052463074fb8e3970db122bc06a7a016 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ecd7a4a4d84f0dc44190bcc5a413ca4f964a21ef (diff) | |
parent | 598f7cea130eeb847d9129eeda9753a57f45ab8e (diff) |
Merge "docs: Updated wording of callout describing device opt-out options. am: b48909ed52 am: bdbe6fd94f am: 6c955db797 am: 82c686b714" into nyc-mr1-dev-plus-aosp
am: 598f7cea13
Change-Id: Ief2c4a101c06e960ec0a475e4b765d86f1f78152
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions