diff options
| author | Xin Li <delphij@google.com> | 2017-11-15 01:30:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-15 01:30:08 +0000 |
| commit | 16a57ef3d00c8a3c36af889f4d6de5806a43c9e9 (patch) | |
| tree | e8ace421152054b71b24ed16e10e97c367692bfa /framework/java/android/bluetooth/BluetoothHidDevice.java | |
| parent | 3dc04e83741db2618ef70fca66b62bc50b1e2b76 (diff) | |
| parent | 248e2a0409adfe33f12ba3a4ddbf90f1b22cf37d (diff) | |
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.
am: 248e2a0409 -s ours
Change-Id: I2d08ca9a952babfd1480278ca6331b697be2a32e
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothHidDevice.java')
0 files changed, 0 insertions, 0 deletions