summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2016-01-14 06:38:27 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-14 06:38:27 +0000
commit2bb7707e00922d2f614b8d92bdf3e62dfa6fd80d (patch)
treef06839eadf3bf59f0a53634cdbc38921cdd8fe29 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentfa86813a56cf631b4609387e8ef5ed9e82b47eac (diff)
parentcd097ff856b800e3d6b991adfe2316007ddb9957 (diff)
Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev am: c6c9b2aa66
am: cd097ff856 * commit 'cd097ff856b800e3d6b991adfe2316007ddb9957': Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions