diff options
| author | Zhihai Xu <zhihaixu@google.com> | 2013-06-11 14:13:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-11 14:13:56 -0700 |
| commit | 352e56ee97d24422b857304819f26958ad1b0811 (patch) | |
| tree | 69858e992b7a6f3370b36080fbb4c64b28ede32d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3ae015bc7d2f1da3683b58d7ccfbf8dfb61da7e8 (diff) | |
| parent | 36e90664c7b74bd90b56b17afb407729f7949108 (diff) | |
am 36e90664: am bcc6ae88: Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev
* commit '36e90664c7b74bd90b56b17afb407729f7949108':
Let RemoteControlDisplay know more about playback position
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions