Conflicts: tools/droiddoc/templates-sdk/sdkpage.cs Change-Id: Ibc2edc2550fe93b3c8f2c7e041fae81136fdb1c2