summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAriel Gertzenstein <agertzen@google.com>2015-01-09 17:59:15 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-09 17:59:15 +0000
commitb32831eebfd3c3ba2b26da18fef6818c12643f9d (patch)
tree8dd01c35c166083df55c64d2dba0106266bdc0ec /tools/aapt2/java/JavaClassGenerator_test.cpp
parent34f3adedcc20b365361f40131347179152377954 (diff)
parentcce8db2c31a03d0c4e04f5851415d37032ae6621 (diff)
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev
automerge: cce8db2 * commit 'cce8db2c31a03d0c4e04f5851415d37032ae6621': 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