tree b52bfc1f8507804994cbe6608863b8d0dc598b66
parent 3549e73b4ee33302d8374117a5acdd3b21d5b828
parent a328d25783692e4856109687efe3d9dbddb58c8c
author Clay Murphy <claym@google.com> 1399395712 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399395712 +0000

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

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