diff options
author | RoboErik <epastern@google.com> | 2014-09-03 00:25:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-03 00:26:10 +0000 |
commit | 42f0a36eceb051f1f06491855598222f97f93f79 (patch) | |
tree | b98500f5baa4a3348298da858e098336aea9cb69 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d400ca2f8db42e57e41f2a999833703619348fef (diff) | |
parent | f2133474afce7808541c92a1e5c78eb8b0950329 (diff) |
Merge changes Id38bcf7c,I54f156d9 into lmp-dev
* changes:
Update MediaController comment to mention notification listeners
Don't play a sound when adjusting volume while telephony is active
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions