diff options
| author | Junda Liu <junda@google.com> | 2015-08-27 10:36:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 10:36:14 +0000 |
| commit | d43d9a8776b7388cb933c7866166a806b5c2a9e2 (patch) | |
| tree | 715d547d2502de8d04de0ec12233b3183ce62c99 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9c263f8e115e5b7bb46f10b0bd51c7688822b861 (diff) | |
| parent | 261ef07b6f5c324e809d40d4e87786fb83f9644a (diff) | |
am 261ef07b: (-s ours) am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
* commit '261ef07b6f5c324e809d40d4e87786fb83f9644a':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions