am aefcbfcf: Merge change Ib5817a3a into eclair

Merge commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d' into eclair-plus-aosp

* commit 'aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d':
  sdk doc change for esr: update version refs to 2.0.1.