tree 86210829de1bac32907cff0d4d6c23a902a5d0bf
parent 740a332d27113ede617c93973763c39d7707e746
parent 23341114a0ef192691d1d8d6b89260bc4f4153e0
author Bill Yi <byi@google.com> 1489596705 -0700
committer Bill Yi <byi@google.com> 1489596705 -0700

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