diff options
| author | Ariel Gertzenstein <agertzen@google.com> | 2015-01-09 18:03:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-09 18:03:03 +0000 |
| commit | 4a207e3e52044839b035c2a0af9c240d31692422 (patch) | |
| tree | 7620c40d27c997130008e8a78e0229fab4223f40 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e24637e641ec1f39455f270a4d6050c4d0383515 (diff) | |
| parent | b32831eebfd3c3ba2b26da18fef6818c12643f9d (diff) | |
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev automerge: cce8db2
automerge: b32831e
* commit 'b32831eebfd3c3ba2b26da18fef6818c12643f9d':
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions