OSDN Git Service

Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev
authorMaurice Lam <yukl@google.com>
Mon, 15 Dec 2014 17:44:52 +0000 (17:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 15 Dec 2014 17:44:53 +0000 (17:44 +0000)

Trivial merge