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