tree 2c59301466b93d344340d49c415e9544345463e9
parent 6996f91809c3b56a7a7e5ba5b170a9905192b62a
parent 9259663cdb8f15226844e3ecfc6e3aa53614ad03
author Elliott Hughes <enh@google.com> 1383096976 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383096976 -0700

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

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