diff options
author | Tony Mak <tonymak@google.com> | 2017-08-17 22:31:04 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-17 22:31:04 +0000 |
commit | d3e7874558db79dfc91fc305b85a37302c85e85e (patch) | |
tree | e01f9f998d9bc7d3b95f06f7ae2f14af191ed4e5 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | d15f2481be76fe2e949fd59b4185f7196fa4a8c1 (diff) | |
parent | 273bd3b67f8bc0446f1c873effa0c9ed6227358f (diff) |
Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am: 0c2b2d1f87 -s ours am: c9a9fcdcd3 -s ours
am: 273bd3b67f -s ours
Change-Id: Ib1734b1826e29143bdf7b4d0d9c8acfe9f259ad7
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions