tree 50b9b74ea3f1cea6b533736783fbc6119a48b741
parent 7e11bb837af85fc9e92eb8f13ef3a659b13df6c5
parent a728543a34e4095dfd1f661dfd3dd6d2ccbca657
author Winson Chung <winsonc@google.com> 1337796961 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337796961 -0700

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

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