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