tree da95131c3eaedfc04c9ade571e14f2a6c183bc5b
parent 586096a9575a52ea7fa318f6f8540b47ba2ed2e8
parent a7ce2f04ef0ae548370eebd1314558f24f40e8f0
author Scott Main <smain@google.com> 1296093386 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296093386 -0800

am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread

* commit 'a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
  catchup the gingerbread branch to gingerbread-docs for all sdk docs