tree 3b48d69ce5f148080357d463e1f2f15bb5c3a82f
parent 592364b53ddde403d6bc0db7cf5ed592f7e12dd0
parent d398c2724c8a942961d13245a4669db0555080e4
author Andreas Huber <andih@google.com> 1348817653 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348817653 -0700

am d398c272: am ecc8db5e: Merge "Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit." into jb-mr1-dev

* commit 'd398c2724c8a942961d13245a4669db0555080e4':
  Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.