tree 2f374c3787b1cd4c80a74ee84b51dc1082622a4f
parent 5da02a476944c6ca3672cf00265f7f163028a8c5
parent f79daa942005608e56a4a0d7f414fedccd56e467
author Eric Laurent <elaurent@google.com> 1351631680 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351631680 -0700

am f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev

* commit 'f79daa942005608e56a4a0d7f414fedccd56e467':
  display audio dialog when connecting low end dock