tree 5d8aff01b16ff15213910b560f2d38eb9a59451e
parent 0ba2287d2006fe2b376fadec6cf79a0e85dba46d
parent 3a14fee0ac9c4fd92720e80e78dd101b396277fb
author Huan Ren <huanr@google.com> 1498246986 +0000
committer android-build-merger <android-build-merger@google.com> 1498246986 +0000

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

Change-Id: I839e0dc31bfee04deb2dd87cf847f7f7c9d39254