diff options
| author | Justin Koh <justinkoh@google.com> | 2014-09-30 00:39:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-30 00:39:16 +0000 |
| commit | 92ffd6b5fe11c649483c1ae53ec72a42d33629dd (patch) | |
| tree | 82152b9e7dc886c3bbbc4617930362ad415dfa17 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cdc494512edb13c0405e1f4410439112e39102ae (diff) | |
| parent | 28d01e677c05edaa45456a26dff22d1b0fc28164 (diff) | |
am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
* commit '28d01e677c05edaa45456a26dff22d1b0fc28164':
DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions