summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAlexandru-andrei Rotaru <rotaru@google.com>2017-08-03 15:54:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-03 15:54:49 +0000
commit7a757e9dd6a52605ef5fe1473f5b292b6c915ec4 (patch)
treeb637529f3720bfed6515197891676c1cdd4bd93c /tools/aapt2/java/JavaClassGenerator_test.cpp
parentec40b1b0b6951c5e84cfbe06c716d9b66433edc3 (diff)
parentca48fcd256be53ed35bb0c52371d9ad3f4709c71 (diff)
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master am: b9295c7de0 -s ours am: 7b3fd55c30 -s ours am: 3668323bd7 -s ours
am: ca48fcd256 -s ours Change-Id: I67af2c1b8561937ddffafd434220c7769d8c4cdf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions