tree f96b97d37fe4bc09e305b969b76b4404f46d02bf
parent 6f6b2090cfb981b0c52b0c9271753968a6e94cc2
parent 8c627b04898cab723e0df8666a7cc11d5d1c70f1
author Dirk Dougherty <ddougherty@google.com> 1260934192 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260934192 -0800

am 8c627b04: Merge change Ib471b5b2 into eclair

Merge commit '8c627b04898cab723e0df8666a7cc11d5d1c70f1' into eclair-plus-aosp

* commit '8c627b04898cab723e0df8666a7cc11d5d1c70f1':
  sdk doc change for esr: Add left nav highlight for interior files in resources tab.