diff options
author | Sooraj Sasindran <sasindran@google.com> | 2019-02-25 10:47:03 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-25 10:47:03 -0800 |
commit | b1e0cce208b17e8b5f083f9f72e3443177077c3f (patch) | |
tree | 10dde55471b80bbdc78eea2edaff81be6a21e298 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f68fdfcfa13bbe16129f0802a0c4f3b1f83dbc9f (diff) | |
parent | 0acab502a0efcea06d43e8cdf015933ba1311c80 (diff) |
[automerger skipped] Merge "Allow UiAutomation to adopt the shell permission indentity" am: 9f0115bb6e am: 178684530b
am: 0acab502a0 -s ours
am skip reason: change_id I4bfd4b475225125512abf80ea98cd8fcacb6a1be with SHA1 d873ae62c4 is in history
Change-Id: I6ab92aea70c139985953a1f9c78111e4c5bf907b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions