tree 16cd4664c41b117c65e4241cfc94d1f57a071630
parent 7679365b54b2f34ad1bc75fba554847865965868
parent 5f3e9e69a16f5a7bc70f3f010c8aae91f287e941
author Eric Laurent <elaurent@google.com> 1297115356 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297115356 -0800

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

* commit '5f3e9e69a16f5a7bc70f3f010c8aae91f287e941':
  Issue 3395734: fix media server restart detection