Syncing with version 0.7 of the emulator.

Review URL: http://codereview.chromium.org/661474
2 files changed
tree: a69728c42e6934121f8d5d5005187d0ec1df6209
  1. src/