tree 45da71f60b69457624d163f5d26d8f147f0728a5
parent 76381ee1cffd7d48da877a4e48e16c540feac871
parent 253e9d083c56ddf224c42e8792c862f8b5d7b109
author Ficus Kirkpatrick <ficus@android.com> 1425773256 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425773256 +0000

am 253e9d08: am c2660259: Merge "clean up a little bit"

* commit '253e9d083c56ddf224c42e8792c862f8b5d7b109':
  clean up a little bit