summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-01-12 16:25:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-12 16:25:56 +0000
commit3454612e2c0879ece4ac17c8b7ba93dce59b1907 (patch)
tree56c683585bf8c9aa2950e64351d4fb6115b38463 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb4eb72322fb26b08c781f051651ec5106725c80f (diff)
parentd74a331ae16b17cf1967186b5392676d2e3c427c (diff)
am d74a331a: Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev
* commit 'd74a331ae16b17cf1967186b5392676d2e3c427c': Avoid showing emergency calls when not possible
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions