tree 83c98966e4d50582936f8f80fc29cde74b9e10da
parent 7822805f5b29efa3ab87af90d0c5b055a7639ab5
parent b7fd60bd3b53871c057721bd6341c8cf65423a64
author Scott Main <smain@google.com> 1332805718 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332805718 -0700

am b7fd60bd: am bd26ba48: Merge "docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs" into ics-mr1

* commit 'b7fd60bd3b53871c057721bd6341c8cf65423a64':