tree 6d26673916c4ea70618473d653e118378614789f
parent 55839ebbb8efc1b3f04707099c54140924b96bb4
parent 171dec7468880ba545a9da2f187fe1dd7e7dca39
author Ajay Panicker <apanicke@google.com> 1510873363 +0000
committer android-build-merger <android-build-merger@google.com> 1510873363 +0000

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

Change-Id: Ie210bbb4a9231377b795ca86219dfab7ee59ff8c