OSDN Git Service

DO NOT MERGE Modify system settings: incorrect UI state am: 119d589ea5 am: 6e88d0b02f
authorSvetoslav <svetoslavganov@google.com>
Tue, 22 Dec 2015 19:46:06 +0000 (19:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Dec 2015 19:46:06 +0000 (19:46 +0000)
am: 58d5d785ca  -s ours

* commit '58d5d785ca68b008f0e410cdf1ab2fe55f38ada5':
  DO NOT MERGE Modify system settings: incorrect UI state


Trivial merge