summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-05-31 17:42:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-31 17:42:23 +0000
commit1bc922b544549d2d5b3e45603b0c28da8d140b72 (patch)
treef1bfffbb0f221217dfb285fa114cbe91e24271e6 /tools/aapt2/java/JavaClassGenerator.cpp
parentd6f9056ff8c7c2c32ca04ef8ad2aca9d4036d3c6 (diff)
parentba92817de83256a4ecf947154fa1cc5e9088f2c8 (diff)
Merge "Merge "Disable app pinning when emergency call button pressed" into nyc-dev am: 8b655e0f57 am: fe9877d877" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions