diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-08-27 10:38:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 10:38:54 +0000 |
| commit | 615fc09cbdb5b598547d5c2e0f9112b1467ac972 (patch) | |
| tree | 715d547d2502de8d04de0ec12233b3183ce62c99 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 29bea9d4bb13fa1dfbbfb9bbb63c996ec9111eef (diff) | |
| parent | 750598f89e1a313c2bbea6ee4c87780891e0108a (diff) | |
am 750598f8: (-s ours) am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit '750598f89e1a313c2bbea6ee4c87780891e0108a':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions