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