diff options
author | Jeffrey Vander Stoep <jeffv@google.com> | 2019-07-18 12:29:20 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-18 12:29:20 -0700 |
commit | 41c6f6c957c814b77ce435c2fd16b0e000a58ab2 (patch) | |
tree | 2f3b5bf0bb8eeb5fc7e75b53eb29f486be20c5b3 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | adc4d87d76a6decc3b7a0484f3d33c3f6585ff71 (diff) | |
parent | e5917770d136b9671b65b6967c9737e422ac996e (diff) |
[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" am: c799747103 -s ours
am: e5917770d1 -s ours
am skip reason: change_id Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc with SHA1 bbb75b1263 is in history
Change-Id: Ib01eed6e0284a2f12c224807c3972e4bac174769
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions