diff options
author | Jordan Liu <jminjie@google.com> | 2019-10-09 09:53:51 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-10-09 09:53:51 -0700 |
commit | 51c0252220faf47f6d2e27cf4064bf4e1f15582c (patch) | |
tree | 998b24265dbaa14293849147ac9f38894996995f /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 362f1bd64bab49a391cdb1be931803b1700af204 (diff) | |
parent | cb0c6c90a91bee4830b7162eefadc59253a7c65d (diff) |
[automerger skipped] Merge "Add CellBroadcastService and related permissions" am: 32382561a6 am: a2ca902d2f am: d208c955e5
am: cb0c6c90a9 -s ours
am skip reason: change_id Ib1b20da03d271fc0b2736774b2ca6c6514944093 with SHA1 289dfd037f is in history
Change-Id: I5ff41e1ce3c99c13be211be99c8fc927adb1c7eb
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions