OSDN Git Service

Merge commit '98691c26ecdaf8689739966b1aeeaa54f3fd1eb2' into manual_merge_98691c2
authorAjay Panicker <apanicke@google.com>
Fri, 6 May 2016 23:10:04 +0000 (16:10 -0700)
committerAjay Panicker <apanicke@google.com>
Fri, 6 May 2016 23:10:04 +0000 (16:10 -0700)
commite308ed5889ddbc6b3fad2f4fd6f2a56ca83c9a2a
treee93286f08c71567e821b477ecc03208cd15e83df
parent3baac1fb6afa84c3fdaa5ba96df9df25fa86cd24
parent98691c26ecdaf8689739966b1aeeaa54f3fd1eb2
Merge commit '98691c26ecdaf8689739966b1aeeaa54f3fd1eb2' into manual_merge_98691c2

Change-Id: I57aeffc87caa6da75773d811eb929d9c2aeca13d
src/com/android/bluetooth/gatt/GattService.java
src/com/android/bluetooth/gatt/ScanClient.java
src/com/android/bluetooth/gatt/ScanManager.java