diff options
author | Lajos Molnar <lajos@google.com> | 2016-06-27 16:32:09 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-27 16:32:09 +0000 |
commit | ec6b93c995642d7a01b0c99f0cededaefad68f51 (patch) | |
tree | b1570b1bc0c7f4e9cac25c7d753649c010661774 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9cecd0a9a2622251366d751774eb312686688e25 (diff) | |
parent | 19a08cc5cb0a968bab7fb92f00c32b05befa41f4 (diff) |
Merge \"Merge \\\"media: document output image crop and layout for MediaCodec\\\" into nyc-dev am: 939484b8ab am: 153d6e5531\" into nyc-mr1-dev-plus-aosp
am: 19a08cc5cb
Change-Id: I34d467611ccf65ad6fcdc6dcdcce4ff34bacb1f8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions