| commit | 526e4b41550fa70e08cfcfc7bfbc2aa88a9f71d7 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Thu Oct 23 00:02:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 00:02:44 2014 +0000 |
| tree | 2c751bd575e7b22cd506879e0cf4d54e0f2be84c | |
| parent | 5b7e25aa7cfa2e39f4168049eda0b435e87e147a [diff] | |
| parent | c1dc875224f9b2286bfe455f37006aabaa057431 [diff] |
am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev * commit 'c1dc875224f9b2286bfe455f37006aabaa057431': Disable factory reset for secondary users