summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-07-21 05:23:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-21 05:23:00 +0000
commitd1496ec2c042586bfddaea0f6b98958d4991aed7 (patch)
tree84b583874393d5c03ff232eabfbd1e09201182c0 /tools/aapt2/java/JavaClassGenerator.cpp
parentee58159419cb15b0a3c088f2fb451b43535808e4 (diff)
parent6b2fb28f4e36904455817560af49ddfdcfc62138 (diff)
Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe am: 30f2df2f34" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions