diff options
author | Alexandru-andrei Rotaru <rotaru@google.com> | 2017-08-03 15:27:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-03 15:27:15 +0000 |
commit | 3668323bd758481afe390eaae543129f06e755d6 (patch) | |
tree | 3c4f6be0eab74f60485d79417c0fcaf1e2d70ef6 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 49cbe41a2b6bc4983d41afc21f80869772e84db2 (diff) | |
parent | 7b3fd55c305bc203924412e221c8759a59d0ee0b (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
Change-Id: Ieab87f4b422168e3bcf8250e405ec91ee67d0e27
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions