tree 86725a3245938f6cb93b0c582ca80de4ecf9a05f
parent aa98204f89406a37138178c488cb7454dcd51751
parent a230e6b83afdd327b07ea5b2198b05b729777a8d
author Thomas Joseph Avila <tavila@google.com> 1494978021 -0700
committer Thomas Joseph Avila <tavila@google.com> 1494978021 -0700

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