tree 55528c2d23c1b2fbbc82506abd51355498e95246
parent d27836d324f2703a149dc42b59ab6d0d51d7ba1e
parent b9332a43b873c95958a390a5ce5a3e65b831a5bf
author Jaewan Kim <jaewan@google.com> 1520381837 +0000
committer android-build-merger <android-build-merger@google.com> 1520381837 +0000

Merge "MediaSession2: Ask server whether a controller is trusted" into pi-dev
am: b9332a43b8

Change-Id: I2933c572f9960dc1d39c7608c99914d79a06acff