diff options
| author | Amith Yamasani <yamasani@google.com> | 2017-08-30 02:37:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-30 02:37:33 +0000 |
| commit | 141a50807a9a5ad2e2962bc13f303f397209b373 (patch) | |
| tree | 98790ce5d7ab23188ed98b1287f52af7c074581d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 29f0ca46717084361ad6028678dd541a267dd99a (diff) | |
| parent | 6e1a98ddd1948dd9876ce9f3e834a36adf0c318c (diff) | |
Merge "Screen-pinning unpin security fails for secondary user. DO NOT MERGE" into oc-mr1-dev am: eb7b039304
am: 6e1a98ddd1 -s ours
Change-Id: Id91979813259c523998c21bfe5d270b37fe7364f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions