tree 6ee93bbd3bde6be321e0b6992711e513d4ad6643
parent cf667ad7d77559cde0416e2f97a60827acf5e73d
parent 1434a4075d4582d932023b1720b2a1213e6ea282
author Jeff Sharkey <jsharkey@android.com> 1378873246 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378873246 -0700

am 1434a407: Merge "More tweaks to match UX spec." into klp-dev

* commit '1434a4075d4582d932023b1720b2a1213e6ea282':
  More tweaks to match UX spec.