am 3bfb5192: am 0086ab50: am 1a177879: Merge change I06c40454 into eclair-sdk

Merge commit '3bfb5192cb2abb725d75dcbea4b58a6cbb2903fc' into eclair-mr2-plus-aosp

* commit '3bfb5192cb2abb725d75dcbea4b58a6cbb2903fc':
  droiddoc change: revise the sample code generating script so that