tree 964adff8cf13c7a84bfac74f919ac54997698012
parent e0a95d4dd2d19e14eda5945af7dc5c06d9378d5d
parent f26c9ce629042da0725c963987f0d6f99c889d5a
author android-build-team Robot <android-build-team-robot@google.com> 1496946340 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1496946340 +0000

Merge cherrypicks of [2379347, 2379239, 2379364, 2379160, 2379220, 2379290, 2379348, 2379328, 2379329, 2379349, 2379350, 2379365, 2379401, 2379351, 2379330, 2379313, 2379382, 2379275, 2379331, 2379352, 2379292, 2379314, 2379315, 2379402, 2379421, 2379369, 2379255, 2379317, 2379404, 2379279, 2379334, 2379372, 2379335] into mnc-mr2-release

Change-Id: I2eb67591b1334a255d08c4faf786e470f400bb6a