diff options
| author | Jason Monk <jmonk@google.com> | 2015-01-13 20:31:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-13 20:31:32 +0000 |
| commit | 44f397efcf398a99bcdffd484605e83ea0cd90e9 (patch) | |
| tree | e3836e5595605e0137bc00d9af291aedb149a9ab /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 22c0b4bc3e089c9ae800a8b37808bd5c9c6a76eb (diff) | |
| parent | 2168062b23c8c343330f9a7b074a51efc4780cde (diff) | |
am 2168062b: am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev automerge: a50a668
* commit '2168062b23c8c343330f9a7b074a51efc4780cde':
Carrier text handle sim removal
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions