tree 9070577b1ced24f7a706e5017461d5618f04e4cc
parent 2fed8096b799b470ce934465d89b4c3d8902fed1
parent 8d8a78064f11925c9d219700fc53a3d59386e06c
author Tatsuhisa Yamaguchi <yamaguchi@google.com> 1442332669 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442332669 +0000

am 8d8a7806: am e3d7e488: am 0b65959b: Fix build error in ExtractDecodeEditEncodeMuxTest.

* commit '8d8a78064f11925c9d219700fc53a3d59386e06c':
  Fix build error in ExtractDecodeEditEncodeMuxTest.