tree 1b82f5a9658b1bf227af1f66475dc092d00aa5d6
parent 2abf9374e012f1705333c5ce59bfc6c5fbbbdea3
parent 06f4971bc05dc14fb567f3cc794af210c507b14d
author Glenn Kasten <gkasten@google.com> 1364337980 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364337980 -0700

am 4b6ed7f2: Merge "media.log dump" into jb-mr2-dev

* commit '4b6ed7f255b696d1555ce71633ea08c961ec51dd':
  media.log dump