OSDN Git Service

am 5f6a8742: am 27420a03: (-s ours) Merge "DO NOT MERGE BLE HID device connection...
authorZhihai Xu <zhihaixu@google.com>
Tue, 11 Mar 2014 19:19:19 +0000 (19:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Mar 2014 19:19:19 +0000 (19:19 +0000)
commit9c141a3eb506998e3f055e73aac368691148cbf8
tree411833822da123aa31aa2b1fd0bbc9c58113d9e5
parent06ad9fde2aba979b2afe4b0084fb36c604e79dcd
parent5f6a874230b3df8c6b67c22d45f0fe2edc91aa08
am 5f6a8742: am 27420a03: (-s ours) Merge "DO NOT MERGE BLE HID device connection failure due to security error." into klp-dev

* commit '5f6a874230b3df8c6b67c22d45f0fe2edc91aa08':
  DO NOT MERGE BLE HID device connection failure due to security error.