tree b19fcfdbfb81d7a71f0f17f0fdc482ab86b050d5
parent a0dc834f6687dd7977c6924116b80c3d94f87666
parent 39c5ca8cf8a45e9c550ef3732e36976b63812593
author Sungsoo Lim <sungsoo@google.com> 1457923367 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457923367 +0000

Merge "MediaControlIntent: Rename constants and methods" into nyc-dev