diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2016-01-14 08:09:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-14 08:09:30 +0000 |
| commit | e3e79ff8c919947ac9279898666d63d1fc188f69 (patch) | |
| tree | ef2c62431cfbe12eb9816e93196d803f7169cf0a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 77799d5dbadf256047ad86d79a42b1fe28db66aa (diff) | |
| parent | 2bb7707e00922d2f614b8d92bdf3e62dfa6fd80d (diff) | |
Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev am: c6c9b2aa66 am: cd097ff856
am: 2bb7707e00 -s ours
* commit '2bb7707e00922d2f614b8d92bdf3e62dfa6fd80d':
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