tree 83c98966e4d50582936f8f80fc29cde74b9e10da
parent 6b59266b0bf861f42b181b602115b8a8833c7212
parent 72d125eb872f2185dd36ef34d04555dff5eb20f3
author Scott Main <smain@google.com> 1332805650 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332805650 -0700

am 72d125eb: 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 '72d125eb872f2185dd36ef34d04555dff5eb20f3':
  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