tree b52bfc1f8507804994cbe6608863b8d0dc598b66
parent 22af2469682b0ecaf5192e47e871771e727a3ccd
parent 4d8a981012eb890d64e7600b7037837276ba9fa3
author Clay Murphy <claym@google.com> 1399395857 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399395857 +0000

am 4d8a9810: am a328d257: Merge "Docs: The usual linux build environment is Ubuntu 12.04"

* commit '4d8a981012eb890d64e7600b7037837276ba9fa3':
  Docs: The usual linux build environment is Ubuntu 12.04