diff options
| author | Pavlin Radoslavov <pavlin@google.com> | 2016-06-07 21:52:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-07 21:52:50 +0000 |
| commit | 7507133c639a8a0b83e613f606182b177a361644 (patch) | |
| tree | b140461ecf9b520b2eda9e1415675a325d9238cf /docs/html/sdk/api_diff/21/changes | |
| parent | 546d5b10a1a9d2ce5ebdcb78fc68992cfa6c9cec (diff) | |
| parent | aa3142551faa2916774f3e7ef4c68cb7718e280b (diff) | |
resolve merge conflicts of ae7641a to nyc-dev-plus-aosp am: c7d4074aef
am: aa3142551f
* commit 'aa3142551faa2916774f3e7ef4c68cb7718e280b':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: I1c04b6b076476bf22099fbc7158319107174697a
Diffstat (limited to 'docs/html/sdk/api_diff/21/changes')
0 files changed, 0 insertions, 0 deletions