tree 6842d52973c2c8e4df61dc57dd168703a2bb84ca
parent 078ef45c895b893421917246802c41c7bafca609
parent 6b59266b0bf861f42b181b602115b8a8833c7212
author Scott Main <smain@google.com> 1332868242 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332868242 -0700

am 6b59266b: am d87f2262: am af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1

* commit '6b59266b0bf861f42b181b602115b8a8833c7212':