diff options
| author | Wei Wang <weiwa@google.com> | 2013-10-29 21:05:37 -0700 |
|---|---|---|
| committer | Wei Wang <weiwa@google.com> | 2014-03-06 18:45:17 +0000 |
| commit | ee0b3e9f824a85eebbabe307310d844a15956ae8 (patch) | |
| tree | a1d08cf8409b2ec4fc549f6503f7b4eca62cba15 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2d1e8c49582fb91df0a05a778c228fc1cd89e026 (diff) | |
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Add bluetooth adv data, APIs in BluetoothAdpater etc.
Cherry picking ble advertising changes from master to KLP MR2.
b/13137996
Change-Id: Id9d2f566b6d9ed0fffe73b67efad2e3d045360b4
Conflicts:
core/java/android/bluetooth/BluetoothAdapter.java
core/java/android/bluetooth/BluetoothGatt.java
Conflicts:
core/java/android/bluetooth/BluetoothAdapter.java
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions