tree 62ae95e5606b65456e4877a437dfcb3020b7cee1
parent f61b86a5f7eddaae5803dd220c3b807fd53ea381
parent 435d5b63211b51b68fe69cebb8bbc451ba0ecd51
author Scott Main <smain@google.com> 1328566506 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328566506 -0800

am afaec576: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1

* commit 'afaec57668551b797505f43d9d9677979dedf0c9':