diff options
author | Elliott Hughes <enh@google.com> | 2014-10-28 04:39:24 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-28 04:39:24 +0000 |
commit | 87ce99ca7243e4556a6cfe9f42cc51531301e979 (patch) | |
tree | befac656dd782e3f955f772a24e61be402d266e8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 9d9aac4cacce75b4847aebce0f019250dc3b4e93 (diff) | |
parent | ced7ebdb1d522b4206e2048b278554ca841aeaba (diff) |
am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."
* commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba':
Migrate off timeFormat12 and timeFormat24.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions