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

* commit '14a54c670a8762551a88d9fc6e06282e690801ce':
main
Jean Chalard 2013-09-26 06:57:06 -07:00 committed by Android Git Automerger
commit 86749e88d1

Diff Content Not Available