tree 071d4eb71d96ecaa749e1a141358b997a4841384
parent 4b1e8aea39b1096ad077af7219d9f2468720e637
parent f57025e457b388c0a9fc35574a79945c4ba4b722
author Bo Hu <bohu@google.com> 1502735697 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502735697 +0000

Merge "emulator: merge oc-emu-dev development project" into oc-mr1-dev