tree da70d2efb8f30d9d092530af6939f08767f7920f
parent a79cb5865f8629eb147cbd2deabb8372c6a168fa
parent 7c60108a64cbc6b87f56964c9c1f3dda60d8493e
author Android Build Merger (Role) <android-build-merger@google.com> 1464205833 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464205833 +0000

Merge "Merge "MediaRouter: Reduce the size of the mediarouter library" into nyc-dev am: e118705e61 am: dd9c5b8075" into nyc-mr1-dev-plus-aosp