OSDN Git Service

Merge cherrypicks of [3484108, 3483651] into oc-m2-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 19 Jan 2018 18:51:19 +0000 (18:51 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 19 Jan 2018 18:51:19 +0000 (18:51 +0000)
Change-Id: Ied8deb31e77aadd4512fe896863f854566299434


Trivial merge