diff options
| author | Jeffrey Vander Stoep <jeffv@google.com> | 2019-07-18 13:13:18 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-18 13:13:18 -0700 |
| commit | 80ec3ceb2e5ad8988d48abd9e8f133a51d50f6d6 (patch) | |
| tree | defc81fdecb58d54b5313392d44d1b7bad0f0534 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 428de6c12a316ca6e4b090e84da9410db57f43b2 (diff) | |
| parent | e3f8e1767085c8b6e1de4d2ac5ec05f7ba1b63bb (diff) | |
[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" am: c799747103 -s ours am: e5917770d1 -s ours am: 41c6f6c957 -s ours
am: e3f8e17670 -s ours
am skip reason: change_id Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc with SHA1 e98dce083c is in history
Change-Id: I47c290c60cadb68a4330b6110a0b99e156358f09
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions