diff options
| author | Leon Scroggins III <scroggo@google.com> | 2015-06-12 16:29:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-12 16:29:07 +0000 |
| commit | 8c9ae41bc7188cfe929d0b4f31c18faf9f9a03f7 (patch) | |
| tree | 368d6c9901c5b94d7c17e87973bf658bbc704ceb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 16c31a77f75a30189a221043ad3ce73ca1610559 (diff) | |
| parent | 303581be5ba3875b0501cb8aa00a0228e22a6cc6 (diff) | |
am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev
* commit '303581be5ba3875b0501cb8aa00a0228e22a6cc6':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions