tree 59db4e6005ba50b75061c20e1f54364d116e724d
parent 0a8624da22ecbfd2ad616fe9e765c0d22cd659ad
parent c2c3c86bf94328ab5918ebac42f7108fd276bacf
author android-build-team Robot <android-build-team-robot@google.com> 1498795858 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498795858 +0000

Merge cherrypicks of [2481491, 2481800, 2481782, 2481665, 2481547, 2481358, 2481802, 2481613, 2481668, 2481614, 2481594, 2481595, 2481548, 2481744, 2481493, 2481494, 2481709] into oc-release

Change-Id: Idc9d585087ef9f3e3e433745c93a791e69540d3e