diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2014-08-28 22:57:20 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-28 22:57:20 +0000 |
commit | c1e3af4a14a411c6ef65699aeb2cea4a638d8b3b (patch) | |
tree | 98988feaa612d4bf58ce4b2a08538dd19ae95de8 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 9bf4abff3f4fbf84c81e9653f79aec9771fc7c7e (diff) | |
parent | 509f77773001cceed11364c46a9764fd70f43be8 (diff) |
am 12dba4a6: Merge "Camera2: Make sure aborting captures on an idle device works." into lmp-dev
* commit '12dba4a61d37dd671dca5e89a76bd8af79e7c5e3':
Camera2: Make sure aborting captures on an idle device works.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions