tree 515ef2150836d4ecedbadcecc2c1a3f30b46de1e
parent 9f467df80493159c2a367ef8d08c79a14a7d52aa
parent 7ecc417419b29b7ae77a94da94532af4aa6aec32
author TreeHugger Robot <treehugger-gerrit@google.com> 1491276254 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1491276258 +0000

Merge "Make sure that the device name is not null before returning it" into oc-dev