tree 70b3a44464fc4dcc56a0ba59cc00c849eb8c1325
parent 064f8b68f9e2404426ba37ce697b52dba6418810
parent 9d5df5ca0491dcb2309c81ec497137f5d7c7a602
author Dirk Dougherty <ddougherty@google.com> 1436414077 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436414077 +0000

am 9d5df5ca: Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs

* commit '9d5df5ca0491dcb2309c81ec497137f5d7c7a602':
  Doc change: add x86 to emulator spec.