commit | 5b1c307f621c0d88fdd1aa1df8ca31d28966b0a0 | [log] [tgz] |
---|---|---|
author | Thomas Joseph Avila <tavila@google.com> | Tue May 16 16:40:10 2017 -0700 |
committer | Thomas Joseph Avila <tavila@google.com> | Tue May 16 16:40:10 2017 -0700 |
tree | ab302d2f8675cd1dc0db36f715853b6da988bcca | |
parent | fa5e4052978873fbb77b483bf6d40c2aaf927c76 [diff] | |
parent | 45459b85d0b5e8316349944d944f9fa91694a893 [diff] |
Merge remote-tracking branch 'goog/security-aosp-mnc-mr1-release' into HEAD