diff options
| author | Peng Xu <pengxu@google.com> | 2015-08-01 16:53:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 16:53:55 +0000 |
| commit | 090eecb9f3d8b055e2ba1b13e20f4922a2fdb075 (patch) | |
| tree | 3c6d9eb83d277d278ed81d2e133ca46b139590af /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a757636e1194ea1b1b95552154885569e34ec76f (diff) | |
| parent | 33d2b3a3fd0871620aec85d6f5f38ac9cc7189cd (diff) | |
am 33d2b3a3: am fcc33738: Merge "Suppress camera launch gesture until setup is complete Bug: 22792563" into mnc-dr-dev
* commit '33d2b3a3fd0871620aec85d6f5f38ac9cc7189cd':
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