tree 83f7997528fe12fdf11c88877e01c081ce346a64
parent f65653b0ed55b932f9ea71e29bec0d860d5017d1
parent 44b8056c17b80b80f8a6f0d9589aba86f5893d89
author Hyundo Moon <hdmoon@google.com> 1491527576 +0000
committer android-build-merger <android-build-merger@google.com> 1491527576 +0000

Merge "Prevent MediaBrowser.mRootHints from being modified in API 21+" into nyc-support-25.4-dev
am: 44b8056c17

Change-Id: I9f6beca1be7b963c62730668dba625ad6b9cbc50