tree 41bd59f14d2b20d17819097b5160287c35cbe257
parent 058c71f15d6d3d340f68f14296526373815efd9b
parent 142193550e6b9844631d4e34dda42e76424fed83
author Svetoslav Ganov <svetoslavganov@google.com> 1449182889 +0000
committer android-build-merger <android-build-merger@google.com> 1449182889 +0000

Merge "[DO NOT MERGE] Modify system settings: incorrect UI state" am: c4321c7e6c  -s ours
am: 142193550e  -s ours

* commit '142193550e6b9844631d4e34dda42e76424fed83':
  [DO NOT MERGE] Modify system settings: incorrect UI state