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