diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-08-24 23:39:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-24 23:39:22 +0000 |
| commit | b8079c5c49e998779d82abd4c19fef99a6705b84 (patch) | |
| tree | b2245b7508cb14ec071aa3f1221964c668b4a6d7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 09adb49eda542f7c2395bf0ab0decc4eb495e66e (diff) | |
| parent | f76d558bb0ea3bbac422a90febfdb0417b5397d6 (diff) | |
am f76d558b: am 93826c7e: am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
* commit 'f76d558bb0ea3bbac422a90febfdb0417b5397d6':
Camera: Add support for notifying NFC stack when camera is active
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions