OSDN Git Service

Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev
authorBart Sears <bsears@google.com>
Wed, 18 Mar 2015 20:21:57 +0000 (20:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 18 Mar 2015 20:22:36 +0000 (20:22 +0000)

Trivial merge