tree 459cd88bd1541423d377b1e05fcc80472381823b
parent d99efb715cee295ce97ac7329f72f30f4bc6df2d
parent 84da67779f407ccc29f1658d48c43f087a9e19a3
author Bill Yi <byi@google.com> 1489596683 -0700
committer Bill Yi <byi@google.com> 1489596683 -0700

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