tree 3c258edf0101a87c65d56defb8af1ef175631b83
parent b845b81ec6d724bd359cdb77f515722dd4066cf8
parent 02f71f3a29584519031ba65b7b9f6e922dc01e87
author Bill Yi <byi@google.com> 1489596700 -0700
committer Bill Yi <byi@google.com> 1489596700 -0700

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