tree b354622ec6288e89f6e40da0371df85a3e7da617
parent ec79d7d357311b6ca6f6387e9ef1c8184a26770c
parent 6ac858c6c38f31d43b65238f5834b791f1cb48d6
author Conley Owens <cco3@android.com> 1381253639 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381253639 -0700

am 6ac858c6: am 30836aa9: am d379101d: Merge "Update docs to recommend Ubuntu 12.04 and OSX 10.8"

* commit '6ac858c6c38f31d43b65238f5834b791f1cb48d6':
  Update docs to recommend Ubuntu 12.04 and OSX 10.8