commit | b99d49628746f6bd15d0251c121c7e0e9a7fdde0 | [log] [tgz] |
---|---|---|
author | Bo Hu <bohu@google.com> | Tue Aug 15 21:40:17 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 15 21:40:17 2017 +0000 |
tree | a90ccdfaa1d53aebe2465f6423ea6c2b6d010e19 | |
parent | d57c88cd20d49c8758492bea79cb49694881a9a2 [diff] | |
parent | dd54be956c43d120842df9e9f1917930bf793742 [diff] |
Merge changes I8471c508,Ie889c3aa into oc-mr1-dev * changes: sdk: copy encryptionkey.img to x86{_64} image zip sdk: use 3.18 kernel