OSDN Git Service

Merge cherrypicks of [2397818, 2397876, 2397900, 2397989, 2397877] into oc-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 13 Jun 2017 00:55:52 +0000 (00:55 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 13 Jun 2017 00:55:52 +0000 (00:55 +0000)
Change-Id: I09dfaa5edda891896fc1a3972167fc3a04a5f923


Trivial merge