tree 6847bd8ef62205a3ffde9d09cd822c3b2e1a7c67
parent 1a8bb3e815629d603886b8f7f6842bd69b559a8f
parent 6e46a3b8e64a7a2ca4754ed7b1f9922719bd0a9b
author Jamie Gennis <jgennis@google.com> 1368050634 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368050634 -0700

am 6e46a3b8: am a1ee12ca: Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev

* commit '6e46a3b8e64a7a2ca4754ed7b1f9922719bd0a9b':
  libcutils: add a trace tag for Dalvik