tree e51bd6930c1919e927ac9330d57ab1e0b3ffa938
parent ad6108c182bc32f186878e12dd79d13d4b503198
parent 52a443f82177221cce02377aa166359d00d0cfab
author Bill Yi <byi@google.com> 1491252207 -0700
committer Bill Yi <byi@google.com> 1491252207 -0700

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