diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2015-08-03 16:38:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-03 16:38:17 +0000 |
| commit | 1055dbe46927b1dfab84a08550f1fa3a09bf84cd (patch) | |
| tree | 7a364f8702f1dff74290266313cf9c59985fc35d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1484a5b68ea3e71bafc457fbfb70130994c08e7a (diff) | |
| parent | a9b4ed9ee65c3db1975defe1b6bb1afd91cd7ba6 (diff) | |
am a9b4ed9e: am 20733ba9: am b1286a7a: am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev
* commit 'a9b4ed9ee65c3db1975defe1b6bb1afd91cd7ba6':
Make vendor keys visible in Camera2 java APIs.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions