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