tree a912929e4fe2633489e0244d1aaabee51160b556
parent d1b401106b6eeea1cda80a29cbc06eb4692a8a92
parent 40609a57f18593f1eafe0a0c8837cc01948711ee
author Zhen Sun <zhensun@google.com> 1497888630 +0000
committer android-build-merger <android-build-merger@google.com> 1497888630 +0000

Merge "Fix crash of setting device name on device w/o BT" into oc-dev
am: 40609a57f1

Change-Id: I5726494f0baba0f3e6028438e1306c6817274be2