diff options
| author | Marie Janssen <jamuraa@google.com> | 2016-12-20 23:43:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-20 23:43:28 +0000 |
| commit | 6c69241457608282047fe4b863750d40a993351c (patch) | |
| tree | 706272291460d180b902d7223e07927f1ef2d6a3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e5eb5bf932c4c0047dc63af584ec939bd06c2493 (diff) | |
| parent | eac9538c5c996de66856ba62275a08f9b34bd89a (diff) | |
Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev am: f77ca5fa18
am: eac9538c5c
Change-Id: I2eb357a770e8495c989caf0b092adc754b436d9c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions