tree 3b3fa1895162a7f41f20f44825b4a3312d5039c4
parent d1d5a847d777ba1d4c09bc89dced3cf5d6247f37
parent 94c61cf156005d547be9fc24c7ae62a9fd33f59d
author Bill Yi <byi@google.com> 1489596684 -0700
committer Bill Yi <byi@google.com> 1489596684 -0700

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