tree 6f94f8617cc2c37e69cb6c0b37db35dda738f44a
parent cee206880ef80ac570df6b369d12f111c00f653a
parent ed559bdb38e4f8edb183420f69490d4eba39f94b
author Nick Kralevich <nnk@google.com> 1404342823 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404342823 +0000

am ed559bdb: am 3dbd7e10: am 1aad06dd: Merge "implement LOG_EVENT_STRING"

* commit 'ed559bdb38e4f8edb183420f69490d4eba39f94b':
  implement LOG_EVENT_STRING