tree b484ac8d44be0f04f73810c931f970bc955ecc6a
parent 0f26808e2c696f8bdcca644e0ddae2af9f753ada
parent 36d44740dd045403ae615b8dd6dac8b9a4e9f5bf
author Elliott Hughes <enh@google.com> 1383082166 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383082166 -0700

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

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