tree e33de71ddd8f6b74e5ece1130178046fb973f8e0
parent 1e869b107424d359b37153b23edc00e190dafd7a
parent 2f01e8416b1716fb22612ff32a93682f2a6c0226
author android-build-team Robot <android-build-team-robot@google.com> 1508825563 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1508825563 +0000

Merge cherrypicks of [3116469, 3116470, 3116074, 3116075, 3116498, 3116499, 3117095, 3115988, 3116845, 3116471, 3116500, 3116573, 3115989, 3116501, 3116076, 3116472] into oc-mr1-release

Change-Id: I963881b08de49004fb53289289e083f57711779a