diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-09-10 01:06:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-10 01:06:47 +0000 |
| commit | 0fb3f695cc273d6c97e7d80c0ac25d8fac263d3a (patch) | |
| tree | 652de5733a7fdbf5705ae5a5443a5026af84b256 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 2f12ee718338d4a40261c605a1fc881e6f6d5893 (diff) | |
| parent | 17076cc262ff7e6b384bcb7354983c21ac33a8e9 (diff) | |
am 17076cc2: am 5a9bb951: resolved conflicts for 5d0e02b6 to cw-e-dev
* commit '17076cc262ff7e6b384bcb7354983c21ac33a8e9':
Add double-tap power button to open camera 1/2
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions