commit | af6f1b929db5832304f3c96e566c24d35c058cfa | [log] [tgz] |
---|---|---|
author | John Dias <joaodias@google.com> | Wed Feb 15 19:53:43 2017 -0800 |
committer | John Dias <joaodias@google.com> | Wed Feb 15 19:53:43 2017 -0800 |
tree | 1e3c922879700db2c6013a5bc7f2a90ec30a4065 | |
parent | d86686b5879b5fba57a0fac47d94982cafaa65bb [diff] | |
parent | 390e1a616eeeb2ecd9e716c7f768c349447cf27f [diff] |
Merge branch 'android-x86_64-fugu-3.10-nyc-mr1-security-next' into android-x86_64-fugu-3.10-nyc-mr1 April 2017.1 Bug: 35315685