OSDN Git Service

Merge cherrypicks of [2281522, 2281413] into oc-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 18 May 2017 01:46:54 +0000 (01:46 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 18 May 2017 01:46:54 +0000 (01:46 +0000)
Change-Id: I5e631095aab176df3df8269d17325d0e4c1daedf


Trivial merge