tree 64f784698e13f4fa93526f5c2a02c5336bb2d238
parent 9b55b3696a9e1a7fee802e508e5a6b6f6ef6d53b
parent 8de7670284b6da8f714e26d04d88fa69b57939e4
author Winson Chung <winsonc@google.com> 1366067369 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366067369 -0700

am 8de76702: am 79721945: Merge "Fixing issue with qsb icons not being sized correctly. (Bug 8543618)" into jb-mr2-dev

* commit '8de7670284b6da8f714e26d04d88fa69b57939e4':
  Fixing issue with qsb icons not being sized correctly. (Bug 8543618)