tree 6d1ced331d9fc227fec3a621f7ece67662c439a5
parent 1434e29ac6a157130c9882606ca577567c91ddc4
parent 5e0cc0d7ab29e5fbd11316cd3147ef96d65f8de7
author Andreas Huber <andih@google.com> 1347302483 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347302483 -0700

Merge "Fix port logic in WifiDisplayController." into jb-mr1-dev