Merge commit '3a94ab026f0434624f233e99b1a0aadb9152a09a' * commit '3a94ab026f0434624f233e99b1a0aadb9152a09a': Allow ListPreference summary to use entry
Merge commit '3a94ab026f0434624f233e99b1a0aadb9152a09a' * commit '3a94ab026f0434624f233e99b1a0aadb9152a09a': Allow ListPreference summary to use entry