diff options
| author | Ariel Gertzenstein <agertzen@google.com> | 2015-01-09 18:11:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-09 18:11:50 +0000 |
| commit | d82f9988a96459e6eed309287c02546e4758e450 (patch) | |
| tree | d7df44a26cec3345b06094075e560da1be25f89e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | faafecaa7d795e7473998955a65707491a11baea (diff) | |
| parent | 4a207e3e52044839b035c2a0af9c240d31692422 (diff) | |
am 4a207e3e: Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev automerge: cce8db2 automerge: b32831e
* commit '4a207e3e52044839b035c2a0af9c240d31692422':
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