tree 9a5c9a7ea009e1d06d060587e69056bc03af8a01
parent b02ef371ea3a17d52f232f3ddd6b77daaee7b3da
parent 3ae7a429f69854985158cdd08926bb3b3dd1d110
author android-build-team Robot <android-build-team-robot@google.com> 1505151523 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1505151523 +0000

Merge cherrypicks of [2877873, 2877351, 2877352, 2877353, 2877568, 2877569, 2877069, 2877070, 2877071, 2877072, 2877874, 2877875, 2877876, 2877877, 2877878, 2877570, 2877571, 2877843, 2877844] into oc-r2-release

Change-Id: I3f033216e194ea41a1246fd598b629e88f6a2dce