tree 2a80ef824ab4b2146b211fe5e309b048984aacf5
parent 63d01de22035487e9c5dd96601189d0edd95671f
author bohu <bohu@google.com> 1493092897 -0700
committer android-build-team Robot <android-build-team-robot@google.com> 1498250939 +0000

Emulator: update development to 2362bfb6

Bug: 37302997

oc-emu-dev
commit 2362bfb6d6c4ee4540af5e69130951849c7e109e
Author: bohu <bohu@google.com>
Date:   Thu Apr 6 16:37:48 2017 -0700
Emulator: copy encryptionkey.img to SDK img zip

Change-Id: I057d58733bb39e0777d2f5c9494d5969ac46953a
(cherry picked from commit 6620016eb673ac885e5892604f04d3123a8ee0b9)
(cherry picked from commit 5c26bfa4bc7c873b1d258c7d4cf227a7339d29f7)