diff options
author | Esteban Talavera <etalavera@google.com> | 2017-08-11 12:50:34 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-11 12:50:34 +0000 |
commit | d9d5d43f89f077f45dd1a37684e2ce8130e2741f (patch) | |
tree | d5edbb17b83057b102cbf39491647f34e5065851 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 3d558d8dd8e26bd4e0516129cea9f49f40e4ef94 (diff) | |
parent | b6ba151a6ffecbd048bdc423dc4d3ad66de72dc4 (diff) |
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3 -s ours
am: b6ba151a6f -s ours
Change-Id: Ie26efb399e409d4ca90b434f9dbe6ee648d08c36
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions