tree 5b58b95c6e17ba35bf90867ba49535b04b2beedf
parent 68b14054b96571d4009c6c5a9b4c3413d908a523
parent 7ee1e4ff7346a278a6722108fbc1869240b3e866
author Eric Laurent <elaurent@google.com> 1351374137 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1351374138 -0700

Merge "add settings for dock audio enabled" into jb-mr1-dev