tree fe3b414cb0bb630da5a79b5058a9e42a2f9864bb
parent 97759fa8d1710c0ac87cd24c69a3d1f161ac3ec3
parent 56d630a3eda390d8514c1e1d9f36c95e7808d1dd
author Russell Brenner <russellbrenner@google.com> 1447789997 +0000
committer android-build-merger <android-build-merger@google.com> 1447789997 +0000

Merge "Block developer settings during SUW" into lmp-mr1-dev
am: 56d630a3ed

* commit '56d630a3eda390d8514c1e1d9f36c95e7808d1dd':
  Block developer settings during SUW