tree 12f9f4109b43a34869c50decfc646e35fabdfe23
parent 8199c3028c05cd9c85b6f26fe656518f536bda69
parent 2b295010392c532a47e02e5b003459a50d6d5a62
author Russell Brenner <russellbrenner@google.com> 1447791802 +0000
committer android-build-merger <android-build-merger@google.com> 1447791802 +0000

Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69
am: 2b29501039

* commit '2b295010392c532a47e02e5b003459a50d6d5a62':
  Block developer settings during SUW