tree 449bf69a97b539a039aad4fd41ba5efdc314f48c
parent f7a5721895ee95f4c7b58e8993fb03ec017dab85
parent e0030418fd4b9a9a2d0422a5538a76ca6b40710c
author Dirk Dougherty <ddougherty@google.com> 1259015461 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259015461 -0800

am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.

Merge commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c' into eclair-mr2-plus-aosp

* commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.