diff options
| author | Chen Xu <fionaxu@google.com> | 2019-06-05 20:58:10 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-05 20:58:10 -0700 |
| commit | 6f7720e97b10dbbb9d2beadbe2ea849656d74b77 (patch) | |
| tree | 4673a2daa480c00ccbb61bc026eed7136facf040 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | a3afd26f9f73eccecb7a7b19886ce23819179da5 (diff) | |
| parent | 787511ed38e948d1eba46d3ec66588b2579711cb (diff) | |
[automerger skipped] Merge "skip permission check for TelephonyManager API getMmsUserAgent" am: 4a864b8d96 am: 8baacff5fe -s ours
am: 787511ed38 -s ours
am skip reason: change_id Ib9f211120c34e9b48c02f990088c32fb307a64f2 with SHA1 4878165365 is in history
Change-Id: I71d8dd6f70a30a98b6e5113c1f14ead147cd96bf
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions