diff options
| author | Tony Mak <tonymak@google.com> | 2017-08-17 22:57:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-17 22:57:09 +0000 |
| commit | b85d7b274b58ad5578af43ce319996f835360aec (patch) | |
| tree | 89c7bb6af9f14afb133cd6017b23ca76d6b072d2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 058c3c1ea83bedb12f86e14fb7f528c97d87d63f (diff) | |
| parent | a3ff44a38e30fd2782d97412e7a12d788bbd07ca (diff) | |
Merge "Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am: 0c2b2d1f87 -s ours am: c9a9fcdcd3 -s ours am: b3e6b3708e -s ours am: 97b5068153 -s ours" into oc-mr1-dev-plus-aosp
am: a3ff44a38e -s ours
Change-Id: Ia0961c0717c267de5e87ee0323aeaf9782202427
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions