tree 50b9b74ea3f1cea6b533736783fbc6119a48b741
parent a8c41ebb34af08c9a98426276c9e43be9a379b7f
parent bf2589fb51613f185b65140c40c4c52541af7b29
author Winson Chung <winsonc@google.com> 1337797121 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337797121 -0700

am bf2589fb: am a728543a: Merge "Fix a couple small bugs (issue 6539339)" into jb-dev

* commit 'bf2589fb51613f185b65140c40c4c52541af7b29':
  Fix a couple small bugs (issue 6539339)