diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-05-29 08:10:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-29 08:10:35 -0700 |
| commit | e721b9e0bef6dbba3dda7fb685f63f4dd401afbe (patch) | |
| tree | 32e9e32d7a3e6701ee00cff2681cd444ad0514ab /framework/java/android/bluetooth/BluetoothGattServer.java | |
| parent | 4dadd3783a6eb8dad5e3600e5ba80a3619f4b7b3 (diff) | |
| parent | 15a23a718e34e4d7dabccf2d3950660196f80d1b (diff) | |
am 15a23a71: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '15a23a718e34e4d7dabccf2d3950660196f80d1b':
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothGattServer.java')
0 files changed, 0 insertions, 0 deletions