diff options
| author | Justin Koh <justinkoh@google.com> | 2014-10-01 00:52:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 00:52:00 +0000 |
| commit | 8dd8818bdeb7b264f82da0f0854722ffd7ab7e12 (patch) | |
| tree | 5d899de7b721886fbee7bb9fff45914d02b0c2fe /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 52208590123210506abd2d14124bec1f07847b1f (diff) | |
| parent | 91bd87699137a4ec9f4dc249592401005303f945 (diff) | |
am 91bd8769: am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
* commit '91bd87699137a4ec9f4dc249592401005303f945':
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