tree c297a2f67d4df5c6fc31a8d41c172ea483700844
parent 9376c1a9f5f32439dcebaedba30d9427ba273a98
parent a78b6216232c8add929c20c496e75530d4b42e33
author android-build-team Robot <android-build-team-robot@google.com> 1506036320 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1506036320 +0000

Merge cherrypicks of [2940345, 2938007, 2940429, 2939599, 2939600, 2940430, 2940431, 2940432, 2940433, 2939601, 2939602, 2940112, 2940113, 2940114, 2940115, 2940116, 2938720, 2938721, 2938722, 2938723, 2938724, 2939603, 2939604, 2939605, 2939608, 2938725, 2938008, 2940438, 2940439, 2938727, 2940549, 2940551, 2940553, 2938335, 2940555, 2940557, 2940440] into oc-release

Change-Id: I85fce147af96b50bd26914761e1b61bb13a07769