tree aeaba016557c746bbee0c176a85b9ef101287a69
parent 1f66449c3bd4328116b2b2377f1a2d284e669578
parent 5952f2fb494032575753e73b32ce6fec7828a1ca
author Bill Yi <byi@google.com> 1489596711 -0700
committer Bill Yi <byi@google.com> 1489596711 -0700

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