tree d4852aba5f1dfbaaea3758618f152f934e8de1bf
parent 8f14c89405330f61981c5c85dcc262ef2cc7e2a9
parent 2a7f0b6e6cc1e4ea8d3a5f87f122e77e1a4f4ce5
author Winson Chung <winsonc@google.com> 1316373826 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316373826 -0700

am 2a7f0b6e: am 9627936d: Merge "Updating the qsb. (5051804)" into ics-factoryrom

* commit '2a7f0b6e6cc1e4ea8d3a5f87f122e77e1a4f4ce5':
  Updating the qsb. (5051804)