am 76b08e5a: am dd512e68: am 86749e88: am 14a54c67: am b5feac06: am b2e4031e: am 28eab9d5: am 07905b6a: am 2564bd09: Merge "Reuse old preferences if possible."

* commit '76b08e5aeed91547828aa564bdcb74b2e8753396':
main
Jean Chalard 2013-10-03 16:06:23 -07:00 committed by Android Git Automerger
commit 3d6cdc34f9

Diff Content Not Available