tree aa30a4efbcb88b9f7a5f38fd66d67ae95cd15dfd
parent c36662b042d6ba3f4d8e230f525a70812b0c5deb
parent 5d3c840a879a6fa13a7136b84b4b5cf548938415
author John Spurlock <jspurlock@google.com> 1411504044 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411504044 +0000

am 1cabe53d: am c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev

* commit '1cabe53d61c17743800df7d58df5c5bd7ea6685f':
  Remove redundant wifi-display notification.