summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2016-07-12 18:13:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-12 18:13:00 +0000
commitac201fd93da36a6e2bc38c0a5bf41c09656f0ea8 (patch)
tree4ac64ccafb486de92cb738aef7a386aacf45aba1 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent634841d448c4efcb56e8b090f8b4474bfdb48bc0 (diff)
parentb2ec84bb48f8e739f303de1edcb746ca6baa0656 (diff)
Merge \"Merge \\\"Include new constant for encryption status in the getter\\\'s javadoc\\\" into nyc-dev am: e278cf7665 am: c6b85035b4\" into nyc-mr1-dev-plus-aosp
am: b2ec84bb48 Change-Id: Ic0acda5386b9cb6f6f11d60fb96b6ef626a6f551
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions