tree aae376a23c6aef524515d4b2921730162d8ea2dd
parent eb2466b30362ef8374680a76a5e39a2ccdcdeedd
parent 405c1af75607fafdb1d6faf34e13e032e4934787
author Amith Yamasani <yamasani@google.com> 1306517099 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1306517099 -0700

Merge "Manual merge. Preference activity changes to work on smaller tablet screens and phones."