tree 0d55ab697bf3a454631976052277c6a5f05f0919
parent 549ae327245a844862065dc9bb0562544e8c3beb
parent 0d54e471fa90c2759e86dc47c642f7af277a50f0
author Dmitriy Ivanov <dimitry@google.com> 1397589800 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397589800 +0000

am 0d54e471: Merge "Remove code markers"

* commit '0d54e471fa90c2759e86dc47c642f7af277a50f0':
  Remove code markers