tree cfd1834d39baa35899258a8977c13f769b548bac
parent 5d06ef49b1caa18bf6cf22f25db9fc7124361cda
parent 9b34a4e5d1385140fbddde6b35d7c33a1df3ab58
author Yorke Lee <yorkelee@google.com> 1405537080 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1405471610 +0000

Merge "Make ContactPreferences use SharedPreferences instead of System settings (1/5)" into lmp-dev