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