Commit b99d4962 authored by Bo Hu's avatar Bo Hu Committed by Android (Google) Code Review
Browse files

Merge changes I8471c508,Ie889c3aa into oc-mr1-dev 

* changes:
  sdk: copy encryptionkey.img to x86{_64} image zip
  sdk: use 3.18 kernel
parents d57c88cd dd54be95
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment