tree df1bc9312e824cff239da256ee3765a4813a71d2
parent 4ee45178c8fee24874368b4f67ceb24d62a7baff
parent 7e22cc9965b440a7f34b18cbbec1818f7b7ac68e
author John Reck <jreck@google.com> 1430492438 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430492438 +0000

am 7e22cc99: am 78760b4a: Merge "A bunch more cleanups" into mnc-dev

* commit '7e22cc9965b440a7f34b18cbbec1818f7b7ac68e':
  A bunch more cleanups