tree 45da71f60b69457624d163f5d26d8f147f0728a5
parent e7d5da3dbb635eacafa1f3c36680215d6fec8cd0
parent c332bb47ae267a413f1e3bed5c0e9b95368173aa
author Ficus Kirkpatrick <ficus@android.com> 1425773801 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425773801 +0000

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

* commit 'c332bb47ae267a413f1e3bed5c0e9b95368173aa':
  clean up a little bit