tree 159d1ba58b0931fe7f44db97a11afcefac8015b2
parent 59a960366424a354c7ddbca9a8d6008886ca2a77
parent 9e6e8355f8d7bd1856e69cb8965087a00f1792bd
author Eric Laurent <elaurent@google.com> 1349828727 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349828727 -0700

Merge "fix concurrent headset and HDMI connection" into jb-mr1-dev