tree 6488e64d401693a6f684368a0f15f8b0f0516d26
parent e41ab847a5c12cb7a6a5b2d0f40e101bc9ea6b59
parent 94ca53641975005cda900ad35372c6e5c6b0ff04
author RoboErik <epastern@google.com> 1407453378 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1407433816 +0000

Merge "Add descriptions to MediaController buttons" into lmp-dev