tree a329cbb5c46df853065a18d54b5c2f24fdb22e2e
parent 42b09d255afdb47bc0546183cbc68e86147baaab
parent 99e084ca8012bc7af52ae2fb9e72ab7180177daf
author Nick Kralevich <nnk@google.com> 1423408850 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423408850 +0000

am 99e084ca: Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read"

* commit '99e084ca8012bc7af52ae2fb9e72ab7180177daf':
  Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read