summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothGattServer.java
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@google.com>2013-05-29 05:55:19 -0700
committerThe Android Automerger <android-build@google.com>2013-05-29 05:55:19 -0700
commitadbf9fd806bae89a517a41cdbef228e9aea9f466 (patch)
tree12df83a98f7958f6c0f734939cc986cd8c80b2c9 /framework/java/android/bluetooth/BluetoothGattServer.java
parentb46e8ea169ac2afa88ed41011bfd1ca08cf61f61 (diff)
parentffaba832021cb7e3f8ec9466783f374297444760 (diff)
merge in jb-mr2-release history after reset to jb-mr2-dev
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothGattServer.java')
0 files changed, 0 insertions, 0 deletions