tree 044e687a8964cd04ff21719e15b950edea4deb26
parent d7db96226a035d24af53aa98c16e11d34b24d286
parent f011398da5c70297c74b4120a8b14856ff4684d1
author Thomas Joseph Avila <tavila@google.com> 1494978036 -0700
committer Thomas Joseph Avila <tavila@google.com> 1494978036 -0700

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