| commit | 6c9e60bc2ab363442de4354f075935911bad8c22 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@google.com> | Sat Jun 28 04:12:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 28 04:12:21 2014 +0000 |
| tree | 3d7ed59211f6850a5cdd92936421c931d59e5065 | |
| parent | c5fd68e88dfc8d5c801964541d865c7353c29b15 [diff] | |
| parent | 4a1a92a5f945ecbadc8a8c95ba18cca2c396c26a [diff] |
am 4a1a92a5: (-s ours) Merge "Submitted on behalf of 3rd party copied from external/bluetooth/bluedroid" into klp-wireless-dev * commit '4a1a92a5f945ecbadc8a8c95ba18cca2c396c26a': Submitted on behalf of 3rd party copied from external/bluetooth/bluedroid