commit | 38af9eea6b68eee04d2c88c0b837fa896cba9dbc | [log] [tgz] |
---|---|---|
author | Matthew Xie <mattx@google.com> | Sun Jun 29 05:18:27 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jun 29 05:18:27 2014 +0000 |
tree | 8e10d40172d7b6ed359688f9f906a28146fab32d | |
parent | f6504cd6af975864e0148b9fc7b6fe304faa1798 [diff] | |
parent | 08b1c8d9147c253fecd34686b0c4dcd5b78cc778 [diff] |
am 08b1c8d9: Merge "GAP: Handled collision scenerio with headset" into klp-wireless-dev * commit '08b1c8d9147c253fecd34686b0c4dcd5b78cc778': GAP: Handled collision scenerio with headset