OSDN Git Service

Merge "Disallows setting when user restriction applies" into klp-dev
authorLifu Tang <lifu@google.com>
Wed, 28 Aug 2013 22:29:54 +0000 (22:29 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 28 Aug 2013 22:29:55 +0000 (22:29 +0000)

Trivial merge