diff options
author | Marie Janssen <jamuraa@google.com> | 2016-12-19 17:58:38 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-19 17:58:43 +0000 |
commit | df37f1fa7437dae38925636d1109d7217ea4c1c8 (patch) | |
tree | 97fc5ffab01c62bffa390a7c3053733d28196bd3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f84f98c4e2fc1b49e441ac0a63cd1abac2c03a51 (diff) | |
parent | fa63068deb3b42b1907c0c2214204e2f4e31bd0c (diff) |
Merge changes I546d7abc,I32163278 into nyc-mr2-dev
* changes:
Bluetooth: fix issues re-enabling after crash
Bluetooth: log message improvements
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions