tree 4e75205f9ff26256218cfb4212d42af42c8d7f78
parent f502bdfdb0e05d23989b06716d396be5d9fd2bf2
parent 891bc8be9fe96489038bf3af2a894309ab18b69c
author Chris Banes <chrisbanes@google.com> 1454499271 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1454499271 +0000

Merge "Revert "MediaBrowserCompat: Refactor class hierarchies"" into mnc-ub-dev