tree 5f71b206e30756ba92bd87e44ccfa682b3b8a22a
parent a6a3bccd4137332edaaea1263dc663d7f3af131d
parent f79e3313832fd8bbcc859a641624f54bb81f07eb
author Donghyun Cho <donghyun@google.com> 1486196998 +0000
committer android-build-merger <android-build-merger@google.com> 1486196998 +0000

Merge "MediaBrowserCompat: Use support library implementation for API 24 and 25" into nyc-support-25.2-dev
am: f79e331383

Change-Id: I0dc8379cd3e2b49ee83cef6eec091cc785e380ff