OSDN Git Service

Merge cherrypicks of [2627701] into oc-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Sat, 29 Jul 2017 16:20:43 +0000 (16:20 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Sat, 29 Jul 2017 16:20:43 +0000 (16:20 +0000)
Change-Id: I13dba40107ad2acef7dbe717fcd01f39dbc9ad49


Trivial merge