diff options
| author | Prerepa Viswanadham <dham@google.com> | 2015-05-05 01:05:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-05 01:06:38 +0000 |
| commit | ae4dd524d7f461c1522b6554ab157df9eced5f98 (patch) | |
| tree | b9e9512e74ef20975d7984816a7d9b46e61e5404 /framework/java/android/bluetooth/BluetoothManager.java | |
| parent | 35566b2b38c4925a8a1c5de8578cc3bfc6ee12bb (diff) | |
| parent | 47ac66eb37488dc42784a0d3840719dd45b41ce6 (diff) | |
Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
Merge commit 'b6f59f4' into master_merge
Merge commit 'f6db0ce' into master_merge
Merge commit '17455a3' into master_merge
Merge commit 'b4d5b32' into master_merge
Merge commit 'a1a2fa7' into master_merge
Merge commit '8dfdb98' into master_merge
Merge commit 'eba66c3' into master_merge
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothManager.java')
0 files changed, 0 insertions, 0 deletions