tree 2693af6509e33106cf428ce2d621a6668d037463
parent 5a1bf8373f7de17b394e3d50a6a6f1b00eb3dc44
parent 6002133545b0c33bcc4051074b34c90e8c555eb9
author Donghyun Cho <donghyun@google.com> 1464206377 +0000
committer android-build-merger <android-build-merger@google.com> 1464206377 +0000

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

* commit '6002133545b0c33bcc4051074b34c90e8c555eb9':

Change-Id: I4b1c4797d8dde5cdea98d979462cbd15c218ae47