OSDN Git Service

Merge cherrypicks of [2910953, 2911031, 2908688] into oc-mr1-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 15 Sep 2017 21:11:25 +0000 (21:11 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 15 Sep 2017 21:11:25 +0000 (21:11 +0000)
commit061aa12768af037c4a0cedf341680d79bfddbb70
tree63ea6edfa71dadbd75d7afebd47a43bbc65e1747
parenta4f919d6a392f7e5616190ad2630123584aadb3e
parentb642e91eca889ff986f570d7f9d1a1a5d7a9f0a7
Merge cherrypicks of [291095329110312908688] into oc-mr1-release

Change-Id: I06809d7adbef00becb1829049530a63c51380b0c