tree 45da71f60b69457624d163f5d26d8f147f0728a5
parent 83fe13385b9f6590991a2b521a94a08a062ffd51
parent c26602593286fd574bb880fe0c5e3439de890d37
author Ficus Kirkpatrick <ficus@android.com> 1425662922 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425662922 +0000

am c2660259: Merge "clean up a little bit"

* commit 'c26602593286fd574bb880fe0c5e3439de890d37':
  clean up a little bit