summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorRicky Wai <rickywai@google.com>2016-06-16 10:47:56 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-16 10:47:56 +0000
commit011065846e45cd8aa24a7e34885735a7f46c6957 (patch)
tree3f54f6606a8a087e94f42d296aa37ca8672222a4 /tools/aapt2/java/JavaClassGenerator.cpp
parent61e495268c61ea694a5e67df454a27b221cd4f65 (diff)
parentfcc785679d817c5bea651d32bda89eb0c9ff189d (diff)
Merge \"Merge \\\"Add permission checking on service calls in LockSettingsService\\\" into nyc-dev am: 43f6a45e7e am: 18c57b5cd5\" into nyc-mr1-dev-plus-aosp
am: fcc785679d Change-Id: I9d116b86cc17f8fb48db317470fc1c4cf8a6e757
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions