am 98c11248: am 3fa1cb05: am 5e7f1fbe: Merge change Id2ee762d into eclair-sdk

Merge commit '98c11248becafa61d29aea8a7e10adf418a6c197' into eclair-mr2-plus-aosp

* commit '98c11248becafa61d29aea8a7e10adf418a6c197':
  droiddoc change: add flag to offline docs build to signal