am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to...
am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '796f1af0':
enable preview mode for docs and add api level 10 flag for api level diffs