tree c07d7b05a78f1ed30aeec172a8dd41ae1bc3a682
parent a1e0873bd8ab79f64296d1103a4e9e7ee6a5bbb7
parent afb1ebfc5bf5f16800c7e2201cebce65b5927c57
author Bill Yi <byi@google.com> 1489596706 -0700
committer Bill Yi <byi@google.com> 1489596706 -0700

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