OSDN Git Service

Merge cherrypicks of [2456291, 2456293, 2456332, 2456409] into oc-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Sat, 24 Jun 2017 00:57:01 +0000 (00:57 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Sat, 24 Jun 2017 00:57:01 +0000 (00:57 +0000)
commit3636d0a4ebdeaefdda51a24e471a19b637d7dcc9
treec816364ac9ddbfbf63efe963f1165a2ffdff56f0
parent31e66365200f44f0bf02255e3644d48b2f12778f
parent2373398ce3d0d2753d184de13d566adbf95729f9
Merge cherrypicks of [2456291245629324563322456409] into oc-release

Change-Id: Ie1039c94c762301bcc41648a8a0c044a3eaa3be6