diff options
author | Justin Koh <justinkoh@google.com> | 2014-02-20 17:41:31 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 17:41:31 +0000 |
commit | a79ac472d71de6d13f3561012ca0e870bd9fe04b (patch) | |
tree | 72c9dd8ac9feec40e32df788d1b976dd0ed3068e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c95ed62111e0b8aceda4322011ad019c28987cbc (diff) | |
parent | 744d3473f8a0f9f95e3fdf83670faf6d1551839e (diff) |
am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev
* commit '744d3473f8a0f9f95e3fdf83670faf6d1551839e':
Add hardware feature describing a watch.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions