tree 95e001b9a2a3e4ef6b20254a8e8cda30fe96ef0c
parent 3c47c99731e7adff63e05ffbe7b8840abc5708e5
parent 01de984d1a56b0c9423805b38e7328964753fce8
author Bill Yi <byi@google.com> 1489596685 -0700
committer Bill Yi <byi@google.com> 1489596685 -0700

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