tree 5fb03f025a66d216d658d6a366e6f9fd8922f038
parent 27c1951c3f3c3b1bef5d854704e6f3352473c6a2
parent 6ef94de375e8b3683d4ae9337cf59b5ff294707e
author Winson Chung <winsonc@google.com> 1336698526 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336698526 -0700

am 6ef94de3: Merge "Tweaking the qsb padding to push icons in." into jb-dev

* commit '6ef94de375e8b3683d4ae9337cf59b5ff294707e':
  Tweaking the qsb padding to push icons in.