tree ed39557debb04047f94a4e475dbbb06a639bdf57
parent f6a78079a81a177a3edebc9980829cbf39bf6655
parent c997d4b694dfd3fe1f27d9e6f9574acdec787ff3
author android-build-team Robot <android-build-team-robot@google.com> 1507140746 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1507140746 +0000

Merge cherrypicks of [3012829, 3012750, 3012751, 3012600, 3012601, 3012602, 3012603, 3012849, 3012850, 3012869, 3012870, 3012871, 3012872, 3012873, 3012630, 3012631, 3012632, 3012633, 3012634, 3012752, 3012753, 3012604, 3012605, 3012606, 3012929] into oc-r2-release

Change-Id: I0cce67142c22c9a6ca5d9f3dbb422f499fd89274