summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorBryce Lee <brycelee@google.com>2015-01-08 04:32:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-08 04:32:40 +0000
commitd1646dcfd1d40bdc094f34e05c1359cfc3fa7c65 (patch)
treefcc4f94461ad45278d1c9675f42eeba52974e652 /tools/aapt2/java/JavaClassGenerator.cpp
parent62a1e753b1f73f575c978a377efdc531e7a86b8f (diff)
parentc010c96fdf143b242c9795a71b231ccb4658b625 (diff)
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev
automerge: c010c96 * commit 'c010c96fdf143b242c9795a71b231ccb4658b625': Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions