OSDN Git Service

Merge cherrypicks of [2878293] into oc-mr1-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 11 Sep 2017 19:56:13 +0000 (19:56 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 11 Sep 2017 19:56:13 +0000 (19:56 +0000)
Change-Id: I386826e3901bacaf05c5b7c30247458575689cff


Trivial merge