summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-05-25 03:18:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-25 03:18:38 +0000
commit5dd11aca4aa38fc495adf696ca73a7b1b6a902f0 (patch)
tree8038b1e87f0918dd6fc7361fc19b7171c6d4a188 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1bd23b3bf13aa3f6353321b5af499b937b254405 (diff)
parent62d840380356957207063380b28727d0a55115a9 (diff)
Merge "Merge "Updating user restrictions when they are removed" into nyc-dev am: 1893c4cea7 am: a0afc2111b" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions