diff options
author | Chris Wren <cwren@android.com> | 2013-10-29 10:43:13 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-29 10:43:13 -0700 |
commit | 7aff326aa797f792e4210a10a40d357599e3ada6 (patch) | |
tree | 62fc5147653a4dafdbaa2d208b9b2dce35f330fa /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 38363d14d6e42db28512a76d9423b8edf2298cdf (diff) | |
parent | e0b3f3e106d5b0b9eb31ed3bd43c8a536eb8d1ee (diff) |
am e0b3f3e1: am 4742fe3c: am 64742f84: Merge "show duration instead of remaining time." into klp-dev
* commit 'e0b3f3e106d5b0b9eb31ed3bd43c8a536eb8d1ee':
show duration instead of remaining time.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions