OSDN Git Service

Merge cherrypicks of [2396133, 2396035, 2395977, 2395978] into oc-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 12 Jun 2017 20:08:01 +0000 (20:08 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 12 Jun 2017 20:08:01 +0000 (20:08 +0000)
Change-Id: Ie03104aa72499612285ab9dc5ae2bc91688e4d48


Trivial merge