summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-08-19 01:32:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-19 01:32:46 +0000
commit56df15d3b41e6599e174da92352d85d11f9155ee (patch)
treec11a352efa90de3ee4d2cd58b28791587d86b17a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent40c758316302851a99cf6e285ed7b06497ac36f9 (diff)
parent5b3a38e07dcdbae03f13a55d91a8936996ddc9cf (diff)
am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit '5b3a38e07dcdbae03f13a55d91a8936996ddc9cf': Change default cellular activity timeout to 10
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions