tree 63a846710ae408ba19e59527fb66cd5cf34d2df4
parent 235baed6f388a8986d0c0b98c9d4557e04b8ac48
parent b5cd541ef41913184be2b85527925ca7eee98f6c
author Jaewan Kim <jaewan@google.com> 1523408406 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1523408406 +0000

Merge changes Ic573b522,I1e0bceaa into pi-preview1-androidx-dev

* changes:
  MediaSession2: Temporarily remove Javadoc references to hidden APIs
  MediaSession2: Unhide MediaSession2 and MediaController2