tree 3433335ce3be3a69f12b957130e95b4d19f74e3f
parent 2fcefe45718af44452b725b61f4051f507cb7e5d
parent 8f592378a1ea7f31d57253dc202f42707ef4da36
author Elliott Hughes <enh@google.com> 1383078904 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383078904 -0700

am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."

* commit '8f592378a1ea7f31d57253dc202f42707ef4da36':
  Fix a variety of small publicly-reported bugs.