summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorXiangyu/Malcolm Chen <refuhoo@google.com>2019-11-25 15:15:14 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-25 15:15:14 -0800
commit53994ad2e6b8a6942475802174214cdf21c2bee0 (patch)
treef03405b5af7350854a1734c9227c822bf520b4a9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent37247c85a21d4d418f15c63e0d5534b3a947f70d (diff)
parentc3bd70255e29b243f3a331706cadca75acd75b57 (diff)
[automerger skipped] Merge "Don't allow reading IMSI of one active sub if only has carrier privilege on the other." am: 0f2c3d963d am: 19c52ea987 -s ours
am: c3bd70255e -s ours am skip reason: change_id I67a0121d3e965f193be9e827533646423502fe70 with SHA1 4bff428285 is in history Change-Id: Iddcaf3682e94f97d3de7125498aad1c7efc042b3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions