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