am 81fb25ae: am 7d654d8c: Merge "Fix inconsistency with mutable settings."

* commit '81fb25aeb7738d3807f54227fe47b97783ab2af6':
main
Jean Chalard 2013-09-26 05:54:51 -07:00 committed by Android Git Automerger
commit 8c9c902403

Diff Content Not Available