summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAlexandru-Andrei Rotaru <rotaru@google.com>2017-08-03 14:39:14 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-03 14:39:14 +0000
commit8fe91591034014d32cc5f0cfb465273140fca94c (patch)
treeb407d1e104cc77a444d86be7df1b6702851d09a8 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent558325ca2893d88b6d45a9f42c506ee058320bb6 (diff)
parentc38b519f7111f67dfb87c48731872c11fd561bc2 (diff)
Merge "Notify the user and turn off tethering when the service is disallowed." am: 5027dd1026 -s ours am: 54c1b9e936 am: 1f12dd7bba am: a3c00447b7
am: c38b519f71 -s ours Change-Id: I871db5c642e66094faac1f8c18ffc58a7ac57f3e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions