tree f974b200a7ff8f2d1fc99a2addf3f6385bd1d301
parent c2da70dbc5fefe09cfe8842eaa83db5dd646a714
parent 9561b575438061fabc281b3cbc3d0a83c9479e07
author Dirk Dougherty <ddougherty@google.com> 1289085500 -0700
committer Dirk Dougherty <ddougherty@google.com> 1289085500 -0700

Doc change: Merge commit '9561b575' into master

Conflicts:
	tools/droiddoc/templates-sdk/sdkpage.cs

Change-Id: Ibc2edc2550fe93b3c8f2c7e041fae81136fdb1c2