diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-01-29 18:32:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 18:32:05 +0000 |
| commit | a43742ec620cb11faffa2c2b1847dc1accce5736 (patch) | |
| tree | 7da90026b627a663299758d8613056f103eb9fe4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 64d6bacf13e4ae913c52b773439a542dc5b2b714 (diff) | |
| parent | 6813f29e3247f0567b77fe7eb451215b5fadf67b (diff) | |
am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '6813f29e3247f0567b77fe7eb451215b5fadf67b':
DO NOT MERGE Restore calling identity before checking permission
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions