summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorbsears <bsears@google.com>2018-06-09 23:03:35 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-06-09 23:03:35 -0700
commit1db1009db4a2124dbf8504fd87c7b0807958bd66 (patch)
tree9ef9ef2740522a22188654d5161b5b0acb261f5b /tools/aapt2/java/JavaClassGenerator.cpp
parentb0df70b6edd13235abde3a0fa526a9938088a267 (diff)
parent9b1f560ee56e0c7538f6656a9459a905416509f0 (diff)
Merge "Include "emergency calls only" in disabled SIM strings." into pi-dev
am: 9b1f560ee5 Change-Id: I00c1560589e67279a007d182b1a7c0aba9be2f79
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions