OSDN Git Service

Merge "Make sure that the device name is not null before returning it" am: d4963e8035
authorAjay Panicker <apanicke@google.com>
Tue, 4 Apr 2017 01:35:05 +0000 (01:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 01:35:05 +0000 (01:35 +0000)
am: 87d114ac3e

Change-Id: I874a58ecc54ddd46837c6e21b6244e5bb40312d7


Trivial merge