tree f60fcb5842b87f01fbbb07b9b1b298572acb6315
parent 1d3173c3dc93bb4f2efc5b059fec8e7577b3258a
author Robert Ly <robertly@google.com> 1308075999 -0700
committer Robert Ly <robertly@google.com> 1308075999 -0700

cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb

Conflicts:

	docs/html/sdk/sdk_toc.cs

Change-Id: I03be3486734960c4c691d4d2abe6b17c5114b1a9