summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorNathan Harold <nharold@google.com>2015-10-22 02:58:15 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-22 02:58:15 +0000
commit5be7dbc88d0460dfede5373f1204f4645ce99726 (patch)
tree1fbf3f9537d4c49eb3b2bda78fa04a30d82cf17c /tools/aapt2/java/JavaClassGenerator_test.cpp
parentdc9f8fab0fd9485b22651fe5c7f70961d67d697a (diff)
parent42015c4081f9d37d579f0be15e11725cf6cc5fba (diff)
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev
am: 42015c4081 * commit '42015c4081f9d37d579f0be15e11725cf6cc5fba': Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions