tree b04941d58dd7899ee8ab4791148d635529432ce4
parent b4ad8fd532d4a4dcc4329760b88e92ca0cf50181
parent 088c16befc277069488fa557d86570c78a22f419
author Bill Yi <byi@google.com> 1489596703 -0700
committer Bill Yi <byi@google.com> 1489596703 -0700

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