tree c99e2fea383da696143ade8bc5a307698e827044
parent 1139a4f1e02e48c42fa4e2862b88c0c68c145575
parent d87f2262d84ce6f51967f615704503adaecd3ede
author Scott Main <smain@google.com> 1332798854 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332798854 -0700

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

* commit 'd87f2262d84ce6f51967f615704503adaecd3ede':