tree e734c0ee813f531c06af537da578c093d129e839
parent dc23178be51dc97c05eab0504a91d0c0beb75806
parent 2b3396f9c0e88d1633e16483322d2c52cfc271f3
author Adam Cohen <adamcohen@google.com> 1346106404 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346106404 -0700

am 2b3396f9: Merge "Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)" into jb-mr1-dev

* commit '2b3396f9c0e88d1633e16483322d2c52cfc271f3':
  Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)