OSDN Git Service

Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5e...
authorRussell Brenner <russellbrenner@google.com>
Tue, 17 Nov 2015 20:05:54 +0000 (20:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Nov 2015 20:05:54 +0000 (20:05 +0000)
commit5950ff1d69ca27c09569f40862201ede261c831e
tree2d3ee490751bc5b113887c24d36743f86b6d427f
parent439033dd93417b98acff392865166503a507ff30
parent8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b
am: 8e4f6fbc2e

* commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
  Block developer settings during SUW
src/com/android/settings/DevelopmentSettings.java
src/com/android/settings/DeviceInfoSettings.java