tree 95a4f64b59e368065c2913491d4cba12f64e37dd
parent 15d1c1c95b3d8f25aad81dfdc2fc55028968242e
parent 95fc4f45deb05318d14ce9a27ad8657a94eee4de
author Dirk Dougherty <ddougherty@google.com> 1436415748 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436415748 +0000

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

* commit '95fc4f45deb05318d14ce9a27ad8657a94eee4de':
  Doc change: add x86 to emulator spec.