diff options
| author | Ricky Wai <rickywai@google.com> | 2016-05-11 17:56:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-11 17:56:35 +0000 |
| commit | 3bb6351a4e258937be3c36d5b239f44312e998c6 (patch) | |
| tree | 1fa4a1184bc5777a376af2ea05e8ce3a212fcd19 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9ded33a4c7e4d4990284ada2c2976a1636cad50e (diff) | |
| parent | ca34ab06eca921f8c193dfa7d0b500b6892890e6 (diff) | |
Merge "Use userHandle not credentialOwnerUserId to check if it needs to show lock" into nyc-dev
am: ca34ab06ec
* commit 'ca34ab06eca921f8c193dfa7d0b500b6892890e6':
Use userHandle not credentialOwnerUserId to check if it needs to show lock
Change-Id: I0015c35a2f4b024c22f9bf2e2d43dc6ca25db046
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions