OSDN Git Service

Merge cherrypicks of [2297119, 2297050, 2297018, 2297140] into oc-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 22 May 2017 23:38:49 +0000 (23:38 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 22 May 2017 23:38:49 +0000 (23:38 +0000)
commit8a3eba01b13f03d27dd3bc94dd198143e7408a8c
tree977af6f55e86da231da084ed98adf73f2c82864c
parenta260df4fc1572088105bf5c1f8a63d2ecb0e5025
parent6f4c749f327d877ecc747b3f2909d6646fcf0ee6
Merge cherrypicks of [2297119229705022970182297140] into oc-release

Change-Id: Ie47fcda2263633a6df6b005e461d15b2f76dfe6f