tree 3ad66d15a6e195d22dcaaaf2c321397c2762ed4a
parent f197d6a8d2f59a1f7b7e6d84c812bb1706e2fbf9
parent 150107763d1b5ced8e70992268d7d6fc1888f7dd
author Scott Main <smain@google.com> 1331832331 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331832331 -0700

am 15010776: am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1

* commit '150107763d1b5ced8e70992268d7d6fc1888f7dd':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary