tree 64c73bda60e0e1504f771a58e766511822e7443f
parent 4d1bd06baeb25f71fdbabc3a958d8c83bdbd831e
parent 6ba5159291cb623a5c37f3f86f33d75cc6ad74f5
author Ajay Panicker <apanicke@google.com> 1510873943 +0000
committer android-build-merger <android-build-merger@google.com> 1510873943 +0000

Merge "Add MediaMetadata equals to make metadata comparisons easier" am: 12bc5b6289 am: 171dec7468
am: 6ba5159291

Change-Id: I75138e80effdebee9ec699065360d3e5cc291775