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

Merge commit '0086ab50631cfc6abb0f591871f5bb5da74e4606' into eclair-plus-aosp

* commit '0086ab50631cfc6abb0f591871f5bb5da74e4606':
  droiddoc change: revise the sample code generating script so that