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)
commitdcf2509e75059fcf3f34f82226597681107efb09
tree0d4f0febc397a8abc775230686638a20199064c7
parent079c412def3472fc37750b7f778be3bb03114e38
parent4fb17c1c9847d8a1a7c2386f3f28b91616e73f4b
Merge "Disallows setting when user restriction applies" into klp-dev