summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorChristine Franks <christyfranks@google.com>2017-08-10 05:37:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-10 05:37:57 +0000
commit8121e6c162c9b9d8551a6471cc03ccbdb424b61c (patch)
tree2b7a32b5aab8360297a7ba4dac82c530981a2b45 /tools/aapt2/java/JavaClassGenerator.cpp
parentc75f43c1ab9aac7a0c791f24462c26161dc41296 (diff)
parent88710dead09434df19f872e5114f19e09680323c (diff)
Merge "Add settings and reset operations for demo users" into oc-dr1-dev
am: 88710dead0 Change-Id: Id1b8515e9323731f7bacd55d850460f00fc2c651
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions