diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-06-16 16:28:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-16 16:28:25 +0000 |
| commit | 7b1fda8c98b17dcb49a16c43d801a8042503f2fc (patch) | |
| tree | ee5663147a802cf778e8e399668cc9f585500053 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | b507a6c2bc75b46c7666a66d504ee2ba88e138eb (diff) | |
| parent | 8f4ac9e214a629d6ff1b1277c2d9ec880afe487c (diff) | |
am bfb2ad5e: Merge "Revert "Introduced fading views for the camera interaction on the lockscreen."" into lmp-preview-dev
* commit 'bfb2ad5ed5da824f71290b27bb3962b9641b6a65':
Revert "Introduced fading views for the camera interaction on the lockscreen."
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions