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

* commit '86749e88d104e6592a1117b211b29790a5401090':
main
Jean Chalard 2013-10-03 11:31:07 -07:00 committed by Android Git Automerger
commit dd512e6805

Diff Content Not Available