am 73f2e196: resolved conflicts for merge 7bc0fb1b to honeycomb-plus-aosp

* commit '73f2e196dbfc81a9d3cf9d49bda72277374586c2':
  docs: revise preview statement and links