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