tree 118aa0c540628bd7a268a75b1726062ce71ec168
parent 0417b5554cdbca10c1af8d182cba941188702079
parent 30836aa9dfc1afc87f1373987757423ac1953e32
author Conley Owens <cco3@android.com> 1381253494 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381253494 -0700

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

* commit '30836aa9dfc1afc87f1373987757423ac1953e32':
  Update docs to recommend Ubuntu 12.04 and OSX 10.8