tree 97868f42d48693b73808eb59ff4b63242b879edb
parent 6bb7a89102a8966ee032d6ddc0b3ff4f1a47ef66
parent 1df2557ac95a6d8a087fb15f6f842dc049f2759b
author Dmitriy Ivanov <dimitry@google.com> 1397590857 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397590857 +0000

am 1df2557a: Merge "Remove code markers"

* commit '1df2557ac95a6d8a087fb15f6f842dc049f2759b':
  Remove code markers