tree 1c133ecda03951ff009b6104574f2d61af99bbce
parent e8e6d11d9982a70ffaf07d7408994436b5ea788e
parent 27642459d39858bf013ebf7bc1c7338fe7687a6f
author Bill Yi <byi@google.com> 1489596713 -0700
committer Bill Yi <byi@google.com> 1489596713 -0700

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