tree 2cb24339bd8414d5662606bfa9b78edcd195b029
parent 9046b8480525382ca99d00b737d890977ac0d2f9
parent 2859e34c23e63f6f6486cbfe9c5499729389a369
author Bill Yi <byi@google.com> 1489596707 -0700
committer Bill Yi <byi@google.com> 1489596707 -0700

Merge remote-tracking branch 'goog/security-aosp-mnc-mr1-release' into HEAD