OSDN Git Service

Merge cherrypicks of [2806846, 2806847] into oc-mr1-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 28 Aug 2017 19:38:36 +0000 (19:38 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 28 Aug 2017 19:38:36 +0000 (19:38 +0000)
commitecb5dc470bd97f22d4952aea5bf9920f32768292
tree7051a50d68da5ac89c8870438ea103db059bdad9
parentdfee6775970b6bf3be594a3a9e944daaf3a4f955
parent59ede98737a002bd3328be6ff102396ecc194e00
Merge cherrypicks of [28068462806847] into oc-mr1-release

Change-Id: Ib9e01c88039d98d6442c31a417b71e74fe4a2f9d