tree 7f46562420cfe584c61092c7c6ea154a6828481c
parent 3d90809974f22cd9afb905f62abe42955faa85f2
parent d4a3cae8cc4cf924925ae57723e61c89f6c4fd51
author Dmitriy Ivanov <dimitry@google.com> 1397604990 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397604990 +0000

am d4a3cae8: am 1df2557a: Merge "Remove code markers"

* commit 'd4a3cae8cc4cf924925ae57723e61c89f6c4fd51':
  Remove code markers