summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorPengquan Meng <mpq@google.com>2018-10-08 16:52:07 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-08 16:52:07 -0700
commit59ab24708da1d268b05a7fa7b3571b68ce4942a0 (patch)
tree2ed8bd51f45eeb8e8d1c6d3a9d5d0b55ae40d546 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6b0193db7cf652903b72655a050f388ae97336f5 (diff)
parent152d71136e8279ec8b682d9ebcb021c6b6cfd1a0 (diff)
[automerger skipped] Merge "Add isManualNetworkSelectionAllowed api to telephonyManager" am: 0af8c5c73c
am: 152d71136e -s ours Change-Id: I279f8dd8bc474be8e0d094451cfc4346bd111984
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions