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