OSDN Git Service

am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into...
authorAmith Yamasani <yamasani@google.com>
Thu, 23 Oct 2014 22:10:38 +0000 (22:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 22:10:38 +0000 (22:10 +0000)
commit0e64404a9445c3e073480681d22720240a70f2c1
tree79ce017413b5e26678ca465397891ad683204a42
parentf62af382665f7a8c6d4968a6cb15a0cfb638c505
parent526e4b41550fa70e08cfcfc7bfbc2aa88a9f71d7
am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev

* commit '526e4b41550fa70e08cfcfc7bfbc2aa88a9f71d7':
  Disable factory reset for secondary users
src/com/android/settings/MasterClear.java
src/com/android/settings/search/SearchIndexableResources.java