summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-08-19 00:59:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-19 00:59:10 +0000
commit5b3a38e07dcdbae03f13a55d91a8936996ddc9cf (patch)
tree961274ddc430536ea37383c68c53a8cd156aa398 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb7f482ab41f3c50d2765c53db8b4e79f4e1b7903 (diff)
parentbda9b324c88b70514109f2d9ffc937ca3202fd03 (diff)
am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit 'bda9b324c88b70514109f2d9ffc937ca3202fd03': Change default cellular activity timeout to 10
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions