tree 2a80ef824ab4b2146b211fe5e309b048984aacf5
parent 9e87e29dc8e5e7192f68036e6e21a5a0e4b05d5e
parent 5c26bfa4bc7c873b1d258c7d4cf227a7339d29f7
author Huan Ren <huanr@google.com> 1498242793 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1498242796 +0000

Merge "Emulator: update development to 2362bfb6" into oc-dev