tree e8c859373e4a64fde3f073bc4601947bae5763f4
parent 0433d62291c4e847ae90a6f0a8f264329e1e5617
parent f17f55914e18eb176ccc5bb8266b248ece8cb56b
author Elliott Hughes <enh@google.com> 1383096661 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383096661 -0700

am f17f5591: am 36d44740: Merge "Fix a bunch of small system/core bugs."

* commit 'f17f55914e18eb176ccc5bb8266b248ece8cb56b':
  Fix a bunch of small system/core bugs.