OSDN Git Service

Merge "Removed emergency info and add user when locked from Users settings."
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 28 Dec 2016 02:16:48 +0000 (02:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 28 Dec 2016 02:16:48 +0000 (02:16 +0000)

Trivial merge