tree 678942f5c87df30e46113670cc522734c56cce05
parent 2fd48fcca5d5cecbf9cb4d429f21ca1bbc9ce63d
parent ec5c1c1e291062576925b80b532d36df118103f5
author Nick Kralevich <nnk@google.com> 1423455324 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423455324 +0000

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

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