tree 7d92d926385f75754b29ccc5366969990a454843
parent ce8f8edcc41d65fd0ba9ad136baeeef18fcabb39
parent d385c56dc31a91834e3b3e97c646568be40914bd
author Wei Jia <wjia@google.com> 1438898408 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438898408 +0000

am d385c56d: am 9bf7f2a4: am be30c10e: am a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev

* commit 'd385c56dc31a91834e3b3e97c646568be40914bd':
  MediaSync: fix API comments.