am 3c5622c4: am 8c9c9024: am 81fb25ae: am 7d654d8c: Merge "Fix inconsistency with mutable settings."

* commit '3c5622c4dd8afcbe2f625a475d4bcf6640b6eed2':
main
Jean Chalard 2013-10-03 11:52:30 -07:00 committed by Android Git Automerger
commit daf351f2c6

Diff Content Not Available