diff options
| author | Stuart Scott <stuartscott@google.com> | 2014-11-08 00:21:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-08 00:21:06 +0000 |
| commit | bc1d97556d32a45ceca5db3e2af12cd3d4cf5590 (patch) | |
| tree | 5971b35ba06ff2e9a55c53fbeb6afc91d91477b2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 83892ecb5c38f6e8a216e1596cd6a16bf7bd6a55 (diff) | |
| parent | 0e58219f7fbb3f39af109e0fa6c7ed8c47ee9f3b (diff) | |
am 0e58219f: am 90cf41c3: Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev
* commit '0e58219f7fbb3f39af109e0fa6c7ed8c47ee9f3b':
SubInfoRecord provides a tinted icon with the initial embossed.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions