diff options
| author | Xin Li <delphij@google.com> | 2019-02-25 17:16:05 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-25 17:16:05 -0800 |
| commit | ef1bb7544282711a03959fb9187af95229b9f228 (patch) | |
| tree | e91726466b5e64134783827846f243c4919986d8 /framework/java/android/bluetooth/OobData.java | |
| parent | f886b94d6d8749c24e597c4780cc62460c740269 (diff) | |
| parent | 43bafb872ebb5c3aaa627599e94c46c0e9f788d6 (diff) | |
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: f449f203d6 -s ours
am: 43bafb872e -s ours
am skip reason: subject contains skip directive
Change-Id: I2b3cf7ba11fc80010badbb212902a5507d5caae0
Diffstat (limited to 'framework/java/android/bluetooth/OobData.java')
0 files changed, 0 insertions, 0 deletions