am 3a94ab02: merge from open-source master

Browse Source

Merge commit '3a94ab026f0434624f233e99b1a0aadb9152a09a'

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

...

This commit is contained in:

The Android Open Source Project 2010-07-16 13:56:16 -07:00 committed by Android Git Automerger

parent c54346aa63 3fa4e58341

commit 813e868231

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available