am 3d861fd1
: (-s ours) am d06ba151
: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit '3d861fd129913305196f4b4587211508343e626d':
This commit is contained in: