summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2016-01-14 06:33:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-14 06:33:00 +0000
commitcd097ff856b800e3d6b991adfe2316007ddb9957 (patch)
treeee9484048a5e5c9e78feaaca40deef4bf13dd90a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent2b260b0006403e6be39015c12e422f9782ce6877 (diff)
parentc6c9b2aa66635761b5cebc2faf9e06631c36eab5 (diff)
Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev
am: c6c9b2aa66 * commit 'c6c9b2aa66635761b5cebc2faf9e06631c36eab5': 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