tree 9b15c2849b47b0256f0a94d9706153f31232b89f
parent 9d873d439f017a9a5c017d2c3109360448a98db6
parent 372504684fa0f74c290e0eaf7134979a55118fea
author Scott Main <smain@google.com> 1334041152 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1334041152 -0700

am 37250468: am be36ea9e: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1

* commit '372504684fa0f74c290e0eaf7134979a55118fea':