am 3d6cdc34: 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 '3d6cdc34f9bae02e7d7ff263ebc0c440455f3835':
main
Jean Chalard 2013-10-03 16:54:42 -07:00 committed by Android Git Automerger
commit 9f27c64243

Diff Content Not Available