tree 9cb266a15854ea7fc2af8c4e1e8e38613b84107d
parent bf5d85e633d5818b47e5fd92d69bec7963fc3d52
parent ecc8db5ee83d648532be1392f53277aa3a25284e
author Andreas Huber <andih@google.com> 1348781542 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348781542 -0700

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

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