diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-08-16 02:55:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-16 02:55:33 +0000 |
| commit | 3a94b2d22e8346a884b2521f7e7682f2953d1515 (patch) | |
| tree | a5860ee24879f310c464ed383bdfa852864f2b62 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8c8036838cc483ac951770e5a3a36d1095c30d38 (diff) | |
| parent | 028c2e4e264d1d2235e4d0f95d178fdf77510e7e (diff) | |
am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev
* commit '028c2e4e264d1d2235e4d0f95d178fdf77510e7e':
Camera2: Add camera type to getNumberOfCameras.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions