tree ae42a9474984964d3f96f8c620ef53217cae3d18
parent 6465889ecbf4c04bb4bb6f4e8d4306727f7ca837
parent d4b88c8829cdababbf16aaf903ba25a1669310e7
author Eric Laurent <elaurent@google.com> 1296866023 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296866023 -0800

am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb

* commit 'd4b88c8829cdababbf16aaf903ba25a1669310e7':
  Issue 3395734: fix media server restart detection