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)
commitfcf4e62c59b8677f5d3da4e5549ca7e5e88e2e40
treef7dea09875ba078b3d368d9e4d354977d5a12225
parent186fa23ba309b4fa5fe018e515f6316b0c346410
parentff67503b581e8535f06a53c6f479e446cc2f1638
Merge cherrypicks of [22815222281413] into oc-release

Change-Id: I5e631095aab176df3df8269d17325d0e4c1daedf