OSDN Git Service

Merge cherrypicks of [2805728, 2805966] into oc-r5-release multiwindow-oreo
authorandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 28 Aug 2017 18:42:56 +0000 (18:42 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 28 Aug 2017 18:42:56 +0000 (18:42 +0000)
Change-Id: I6062dd3859b7db54443bb63c7f2a7641c16b255b


Trivial merge