diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-08-28 23:11:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-28 23:11:38 +0000 |
| commit | 96722e12b941b1c626164bfdb819ace6e3fd4347 (patch) | |
| tree | 1a23c358b296559e922286c151cc2b74cf8073c7 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 0a838608c8673742a1c134cf4ef14be2efd30670 (diff) | |
| parent | c1e3af4a14a411c6ef65699aeb2cea4a638d8b3b (diff) | |
am 7d3c202c: am 12dba4a6: Merge "Camera2: Make sure aborting captures on an idle device works." into lmp-dev
* commit '7d3c202cda7cd4791213c36234ab011bd895272a':
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