summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2016-05-31 17:41:27 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-31 17:41:27 +0000
commitba92817de83256a4ecf947154fa1cc5e9088f2c8 (patch)
treef1bfffbb0f221217dfb285fa114cbe91e24271e6 /tools/aapt2/java/JavaClassGenerator.cpp
parent45c5f9417c011609eb1d2c9a089fd3a4a8f4048b (diff)
parentfe9877d877e2f497ac0daff1a4455b00efe57dbe (diff)
Merge "Disable app pinning when emergency call button pressed" into nyc-dev am: 8b655e0f57
am: fe9877d877 * commit 'fe9877d877e2f497ac0daff1a4455b00efe57dbe': Disable app pinning when emergency call button pressed Change-Id: Ib2c7b38dc76033c04feb43137c9526e38b472149
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions