commit | 04a5e3b4ead463efbb117941e44cd0efda89a72b | [log] [tgz] |
---|---|---|
author | Thomas Joseph Avila <tavila@google.com> | Tue May 16 16:39:51 2017 -0700 |
committer | Thomas Joseph Avila <tavila@google.com> | Tue May 16 16:39:51 2017 -0700 |
tree | f164de562746d57a9be4412c74b3ef072ca4bd6b | |
parent | 6229fb8be34e6c137f7964a119f0d915737c4c76 [diff] | |
parent | c898468f166d506cf297a0ac31c3870cb0eb5ca4 [diff] |
Merge remote-tracking branch 'goog/security-aosp-mnc-mr1-release' into HEAD