tree 03dc65b4237d74e0d67cc5196eac1151f10e8255
parent 6b3b57e18d40540a6e50e130358b8b259b356285
parent 3a14fee0ac9c4fd92720e80e78dd101b396277fb
author Huan Ren <huanr@google.com> 1498247255 +0000
committer android-build-merger <android-build-merger@google.com> 1498247255 +0000

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

Change-Id: I9e87b54d39869d6c1f8f21f3e1bb22c268cd380a