OSDN Git Service

Merge cherrypicks of [2822532] into oc-mr1-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 30 Aug 2017 19:48:39 +0000 (19:48 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 30 Aug 2017 19:48:39 +0000 (19:48 +0000)
Change-Id: Ia9bbd22caff7fec805001c20495b8c3477e50ff6


Trivial merge