OSDN Git Service

Merge cherrypicks of [2939596, 2938808] into oc-m2-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 21 Sep 2017 22:34:06 +0000 (22:34 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 21 Sep 2017 22:34:06 +0000 (22:34 +0000)
Change-Id: Ie81cd9463b8c5948d7b8df1f38621fb9a60335fd


Trivial merge