diff options
| author | Jae Seo <jaeseo@google.com> | 2015-06-21 21:51:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-21 21:51:53 +0000 |
| commit | d54bf928bd4bd36027163f16bea322e9bd9edf7a (patch) | |
| tree | 499930600bbf0f37771b8c5ea154631601988981 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 13e3153f978194faedb9c30215992403747a975d (diff) | |
| parent | d71fcb60c6978ec67f0801ec62f86b283312d614 (diff) | |
am d71fcb60: am a5103b9b: Merge "TIF: Add the columns for the app-linking to TvContract.Channels" into mnc-dev
* commit 'd71fcb60c6978ec67f0801ec62f86b283312d614':
TIF: Add the columns for the app-linking to TvContract.Channels
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions