OSDN Git Service

Merge cherrypicks of [2889978, 2889517, 2889500] into oc-m2-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 13 Sep 2017 17:27:07 +0000 (17:27 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 13 Sep 2017 17:27:07 +0000 (17:27 +0000)
commit1c09fda1915e0797e824b2bd06501a8ce0ac7648
treef70b504125b1383cd4aaa35ca02be6e6f8e19e51
parentd5a196368a23dd21106e09733c6aaeec8ba325b1
parent4ec3b538b8951ac7ea09aacce6a780b705b9cb06
Merge cherrypicks of [288997828895172889500] into oc-m2-release

Change-Id: Ie3fdbc69495269cbfdfafe662d6172c3b0f5c168