diff options
| author | Andreas Gampe <agampe@google.com> | 2015-07-24 21:56:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 21:56:56 +0000 |
| commit | 851f51855502e2d4a1cb1bd9764cb6f81682b8a6 (patch) | |
| tree | bde7d121ae16aaf3de17d9c8daccd1a5d9803f36 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 98961ea0007ab540794c8d460d9b060e9503d9c6 (diff) | |
| parent | 08edf246e97b60098a1e7c661b99412577f231f0 (diff) | |
am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev
* commit '08edf246e97b60098a1e7c661b99412577f231f0':
Frameworks/base: Hand fingerprint to ART
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions