am 354954a0: Merge "Doc change: cherrypick testing changes from master....
am 354954a0: Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread
Merge commit '354954a0' into gingerbread-plus-aosp
* commit '354954a0':
Doc change: cherrypick testing changes from master. Squashed commit of the following: