diff options
| author | Peng Xu <pengxu@google.com> | 2015-08-01 17:06:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 17:06:01 +0000 |
| commit | 601154a201d841355ffe9c53ce9b8d54f1aa307e (patch) | |
| tree | 53498e36bb49ceebde331f961df66e6938dee061 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 75cc74b62a9fa8888c0ca52099557deb7d8ad53c (diff) | |
| parent | 090eecb9f3d8b055e2ba1b13e20f4922a2fdb075 (diff) | |
am 090eecb9: am 33d2b3a3: am fcc33738: Merge "Suppress camera launch gesture until setup is complete Bug: 22792563" into mnc-dr-dev
* commit '090eecb9f3d8b055e2ba1b13e20f4922a2fdb075':
Suppress camera launch gesture until setup is complete Bug: 22792563
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions