summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2009-03-06 10:44:45 -0800
committerShawn O. Pearce <sop@google.com>2009-03-06 10:44:45 -0800
commita5057a257b9980e62dc47c6a4e961f773c02ca20 (patch)
tree9922b5ff84b77b409821327f494a01ccfafb4716
parent68f234023015c8394fa52ac47adfd3c9b6e25bbd (diff)
Change copyright messages in file headers to AOSP
Although the code is primarily authored by Google, we are supported under the umbrella of the Android Open Source Project, which keeps track of all contributor agreements for Gerrit Code Review, among the other projects it hosts. Switching the copyright header to a generic one pertaining to the AOSP simplifies things as additional non-Google authored changes are accepted into files. The copyright is muddied as it is, as the AOSP contributor agreement leaves copyright with the original author, but grants perpetual use and redistribution rights under the Apache License. Signed-off-by: Shawn O. Pearce <sop@google.com>
-rw-r--r--src/main/java/com/google/gerrit/client/ErrorDialog.java2
-rw-r--r--src/main/java/com/google/gerrit/client/FormatUtil.java2
-rw-r--r--src/main/java/com/google/gerrit/client/Gerrit.java2
-rw-r--r--src/main/java/com/google/gerrit/client/GerritConstants.java2
-rw-r--r--src/main/java/com/google/gerrit/client/GerritIcons.java2
-rw-r--r--src/main/java/com/google/gerrit/client/GerritMessages.java2
-rw-r--r--src/main/java/com/google/gerrit/client/GerritVersion.java2
-rw-r--r--src/main/java/com/google/gerrit/client/Link.java2
-rw-r--r--src/main/java/com/google/gerrit/client/RpcStatus.java2
-rw-r--r--src/main/java/com/google/gerrit/client/SignInDialog.java2
-rw-r--r--src/main/java/com/google/gerrit/client/SignedInListener.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/AccountConstants.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/AccountMessages.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/AccountProjectWatchInfo.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/AccountSecurity.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/AccountService.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/AccountServiceImpl.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/AccountSettings.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/AgreementInfo.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/AgreementPanel.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/ContactPanel.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/ExternalIdDetail.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/LoginService.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/PreferencePanel.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/SignInResult.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/SshKeyPanel.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/Util.java2
-rw-r--r--src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/admin/AccountGroupDetail.java2
-rw-r--r--src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/admin/AdminConstants.java2
-rw-r--r--src/main/java/com/google/gerrit/client/admin/AdminMessages.java2
-rw-r--r--src/main/java/com/google/gerrit/client/admin/GroupAdminService.java2
-rw-r--r--src/main/java/com/google/gerrit/client/admin/GroupListScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/admin/ProjectAdminService.java2
-rw-r--r--src/main/java/com/google/gerrit/client/admin/ProjectBranchesPanel.java2
-rw-r--r--src/main/java/com/google/gerrit/client/admin/ProjectDetail.java2
-rw-r--r--src/main/java/com/google/gerrit/client/admin/ProjectInfoPanel.java2
-rw-r--r--src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/admin/ProjectRightsPanel.java2
-rw-r--r--src/main/java/com/google/gerrit/client/admin/Util.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/AllOpenChangesScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/ApprovalTable.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/ChangeConstants.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/ChangeDetailService.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/ChangeDetailServiceImpl.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/ChangeListService.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/ChangeListServiceImpl.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/ChangeManageService.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/ChangeMessages.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/ChangeScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/ChangeTable.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/MessagePanel.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/PatchSetPublishDetail.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/PatchTable.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java2
-rw-r--r--src/main/java/com/google/gerrit/client/changes/Util.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/AccountCache.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/AccountDashboardInfo.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/AccountInfo.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/AccountInfoCache.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/AccountInfoCacheFactory.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/ApprovalDetail.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/ApprovalType.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/BasePatchDetail.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/ChangeDetail.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/ChangeInfo.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/GerritConfig.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/GitwebLink.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/GroupCache.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/LineWithComments.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/PatchLine.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/PatchSetDetail.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/ProjectCache.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/ProjectInfo.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/SideBySideLine.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/SideBySidePatchDetail.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/SingleListChangeInfo.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/SystemInfoService.java2
-rw-r--r--src/main/java/com/google/gerrit/client/data/UnifiedPatchDetail.java2
-rw-r--r--src/main/java/com/google/gerrit/client/openid/AllowFrameImpl.java2
-rw-r--r--src/main/java/com/google/gerrit/client/openid/AllowFrameImplSafari.java2
-rw-r--r--src/main/java/com/google/gerrit/client/openid/DiscoveryResult.java2
-rw-r--r--src/main/java/com/google/gerrit/client/openid/LoginConstants.java2
-rw-r--r--src/main/java/com/google/gerrit/client/openid/LoginIcons.java2
-rw-r--r--src/main/java/com/google/gerrit/client/openid/LoginMessages.java2
-rw-r--r--src/main/java/com/google/gerrit/client/openid/OpenIdLoginPanel.java2
-rw-r--r--src/main/java/com/google/gerrit/client/openid/OpenIdService.java2
-rw-r--r--src/main/java/com/google/gerrit/client/openid/OpenIdUtil.java2
-rw-r--r--src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java2
-rw-r--r--src/main/java/com/google/gerrit/client/patches/LineCommentPanel.java2
-rw-r--r--src/main/java/com/google/gerrit/client/patches/PatchConstants.java2
-rw-r--r--src/main/java/com/google/gerrit/client/patches/PatchDetailService.java2
-rw-r--r--src/main/java/com/google/gerrit/client/patches/PatchMessages.java2
-rw-r--r--src/main/java/com/google/gerrit/client/patches/PatchScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/patches/PatchSideBySideScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/patches/PatchUnifiedScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/patches/PatchUtil.java2
-rw-r--r--src/main/java/com/google/gerrit/client/patches/SideBySideTable.java2
-rw-r--r--src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/Account.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/AccountAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/AccountAgreement.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/AccountExternalId.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/AccountGroup.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMember.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatch.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatchAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/AccountSshKey.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/AccountSshKeyAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/Branch.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/BranchAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/Change.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ChangeAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ChangeApproval.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ChangeApprovalAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ChangeMessage.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ContactInformation.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/Patch.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/PatchAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/PatchContent.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/PatchContentAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/PatchLineComment.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/PatchSet.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/PatchSetAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestor.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfo.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfoAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/Project.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ProjectAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ProjectRight.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ProjectRightAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/RevId.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/ReviewDb.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/SchemaVersion.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/SchemaVersionAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/StarredChange.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/StarredChangeAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/SystemConfig.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/SystemConfigAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/TrustedExternalId.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/TrustedExternalIdAccess.java2
-rw-r--r--src/main/java/com/google/gerrit/client/reviewdb/UserIdentity.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/BaseServiceImplementation.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/Common.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/ContactInformationStoreException.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/CorruptEntityException.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/GerritCallback.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/InvalidNameException.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/InvalidRevisionException.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/InvalidSshKeyException.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/NameAlreadyUsedException.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/NoDifferencesException.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/NoSuchEntityException.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/NotSignedInException.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/RpcConstants.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java2
-rw-r--r--src/main/java/com/google/gerrit/client/rpc/SignInRequired.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/AccountScreen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/ChangeLink.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE6.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/LazyTabChild.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/PatchLink.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/ProjectOpenLink.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/RefreshListener.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/Screen.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/SmallHeading.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/SuggestService.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/SuggestServiceImpl.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/SuggestUtil.java2
-rw-r--r--src/main/java/com/google/gerrit/client/ui/TextSaveButtonListener.java2
-rw-r--r--src/main/java/com/google/gerrit/client/workflow/CategoryFunction.java2
-rw-r--r--src/main/java/com/google/gerrit/client/workflow/FunctionState.java2
-rw-r--r--src/main/java/com/google/gerrit/client/workflow/MaxWithBlock.java2
-rw-r--r--src/main/java/com/google/gerrit/client/workflow/NoOpFunction.java2
-rw-r--r--src/main/java/com/google/gerrit/client/workflow/SubmitFunction.java2
-rw-r--r--src/main/java/com/google/gerrit/git/CodeReviewCommit.java2
-rw-r--r--src/main/java/com/google/gerrit/git/CommitMergeStatus.java2
-rw-r--r--src/main/java/com/google/gerrit/git/GitMetaUtil.java2
-rw-r--r--src/main/java/com/google/gerrit/git/InvalidRepositoryException.java2
-rw-r--r--src/main/java/com/google/gerrit/git/MergeException.java2
-rw-r--r--src/main/java/com/google/gerrit/git/MergeOp.java2
-rw-r--r--src/main/java/com/google/gerrit/git/MergeQueue.java2
-rw-r--r--src/main/java/com/google/gerrit/git/MergeSorter.java2
-rw-r--r--src/main/java/com/google/gerrit/git/PatchSetImporter.java2
-rw-r--r--src/main/java/com/google/gerrit/git/PushQueue.java2
-rw-r--r--src/main/java/com/google/gerrit/git/RepositoryCache.java2
-rw-r--r--src/main/java/com/google/gerrit/git/WorkQueue.java2
-rw-r--r--src/main/java/com/google/gerrit/pgm/CreateSchema.java2
-rw-r--r--src/main/java/com/google/gerrit/pgm/EncryptContactInfo.java2
-rw-r--r--src/main/java/com/google/gerrit/pgm/ImportGerrit1.java2
-rw-r--r--src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java2
-rw-r--r--src/main/java/com/google/gerrit/pgm/Version.java2
-rw-r--r--src/main/java/com/google/gerrit/server/AccountSecurityImpl.java2
-rw-r--r--src/main/java/com/google/gerrit/server/AccountSecuritySrv.java2
-rw-r--r--src/main/java/com/google/gerrit/server/AccountServiceSrv.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ChangeDetailServiceSrv.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ChangeListServiceSrv.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ChangeMail.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ChangeManageServiceImpl.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ChangeManageServiceSrv.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ChangeUtil.java2
-rw-r--r--src/main/java/com/google/gerrit/server/EncryptedContactStore.java2
-rw-r--r--src/main/java/com/google/gerrit/server/GerritCall.java2
-rw-r--r--src/main/java/com/google/gerrit/server/GerritJsonServlet.java2
-rw-r--r--src/main/java/com/google/gerrit/server/GerritOpenIdUserManager.java2
-rw-r--r--src/main/java/com/google/gerrit/server/GerritServer.java2
-rw-r--r--src/main/java/com/google/gerrit/server/GroupAdminServiceImpl.java2
-rw-r--r--src/main/java/com/google/gerrit/server/GroupAdminServiceSrv.java2
-rw-r--r--src/main/java/com/google/gerrit/server/HostPageServlet.java2
-rw-r--r--src/main/java/com/google/gerrit/server/HtmlDomUtil.java2
-rw-r--r--src/main/java/com/google/gerrit/server/OpenIdLoginServlet.java2
-rw-r--r--src/main/java/com/google/gerrit/server/PatchDetailServiceSrv.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ProjectAdminServiceImpl.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ProjectAdminServiceSrv.java2
-rw-r--r--src/main/java/com/google/gerrit/server/StaticServlet.java2
-rw-r--r--src/main/java/com/google/gerrit/server/SuggestServiceSrv.java2
-rw-r--r--src/main/java/com/google/gerrit/server/SystemInfoServiceImpl.java2
-rw-r--r--src/main/java/com/google/gerrit/server/SystemInfoServiceSrv.java2
-rw-r--r--src/main/java/com/google/gerrit/server/UrlRewriteFilter.java2
-rw-r--r--src/main/java/com/google/gerrit/server/patch/PatchDetailAction.java2
-rw-r--r--src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java2
-rw-r--r--src/main/java/com/google/gerrit/server/patch/SideBySidePatchDetailAction.java2
-rw-r--r--src/main/java/com/google/gerrit/server/patch/UnifiedPatchDetailAction.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ssh/AbstractCommand.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ssh/AbstractGitCommand.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ssh/AdminFlushCaches.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ssh/DatabasePubKeyAuth.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ssh/GerritCommandFactory.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ssh/ListProjects.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ssh/NoShell.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ssh/Receive.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ssh/SshServlet.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ssh/SshUtil.java2
-rw-r--r--src/main/java/com/google/gerrit/server/ssh/Upload.java2
275 files changed, 275 insertions, 275 deletions
diff --git a/src/main/java/com/google/gerrit/client/ErrorDialog.java b/src/main/java/com/google/gerrit/client/ErrorDialog.java
index a95e49dc72..1181b4ad5c 100644
--- a/src/main/java/com/google/gerrit/client/ErrorDialog.java
+++ b/src/main/java/com/google/gerrit/client/ErrorDialog.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/FormatUtil.java b/src/main/java/com/google/gerrit/client/FormatUtil.java
index 5f0c9dfbda..ba809b31eb 100644
--- a/src/main/java/com/google/gerrit/client/FormatUtil.java
+++ b/src/main/java/com/google/gerrit/client/FormatUtil.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/Gerrit.java b/src/main/java/com/google/gerrit/client/Gerrit.java
index 890da52216..9ba4deff84 100644
--- a/src/main/java/com/google/gerrit/client/Gerrit.java
+++ b/src/main/java/com/google/gerrit/client/Gerrit.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/GerritConstants.java b/src/main/java/com/google/gerrit/client/GerritConstants.java
index 2db2e8634a..c20395ae52 100644
--- a/src/main/java/com/google/gerrit/client/GerritConstants.java
+++ b/src/main/java/com/google/gerrit/client/GerritConstants.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/GerritIcons.java b/src/main/java/com/google/gerrit/client/GerritIcons.java
index fdf359bb39..442cd34371 100644
--- a/src/main/java/com/google/gerrit/client/GerritIcons.java
+++ b/src/main/java/com/google/gerrit/client/GerritIcons.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/GerritMessages.java b/src/main/java/com/google/gerrit/client/GerritMessages.java
index dbb7c0dde3..db6e44e280 100644
--- a/src/main/java/com/google/gerrit/client/GerritMessages.java
+++ b/src/main/java/com/google/gerrit/client/GerritMessages.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/GerritVersion.java b/src/main/java/com/google/gerrit/client/GerritVersion.java
index 587b046f19..f49dfd313d 100644
--- a/src/main/java/com/google/gerrit/client/GerritVersion.java
+++ b/src/main/java/com/google/gerrit/client/GerritVersion.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/Link.java b/src/main/java/com/google/gerrit/client/Link.java
index 9d305ee0f6..2f34c3aa0b 100644
--- a/src/main/java/com/google/gerrit/client/Link.java
+++ b/src/main/java/com/google/gerrit/client/Link.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/RpcStatus.java b/src/main/java/com/google/gerrit/client/RpcStatus.java
index 8aa111e8c7..56e4a2022f 100644
--- a/src/main/java/com/google/gerrit/client/RpcStatus.java
+++ b/src/main/java/com/google/gerrit/client/RpcStatus.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/SignInDialog.java b/src/main/java/com/google/gerrit/client/SignInDialog.java
index eaa61b8a18..82c48d1d97 100644
--- a/src/main/java/com/google/gerrit/client/SignInDialog.java
+++ b/src/main/java/com/google/gerrit/client/SignInDialog.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/SignedInListener.java b/src/main/java/com/google/gerrit/client/SignedInListener.java
index 31905e5d03..1c6feeedce 100644
--- a/src/main/java/com/google/gerrit/client/SignedInListener.java
+++ b/src/main/java/com/google/gerrit/client/SignedInListener.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/AccountConstants.java b/src/main/java/com/google/gerrit/client/account/AccountConstants.java
index 91d23c1ed8..0d734cad8e 100644
--- a/src/main/java/com/google/gerrit/client/account/AccountConstants.java
+++ b/src/main/java/com/google/gerrit/client/account/AccountConstants.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/AccountMessages.java b/src/main/java/com/google/gerrit/client/account/AccountMessages.java
index 5ded58b604..a9019ccd2f 100644
--- a/src/main/java/com/google/gerrit/client/account/AccountMessages.java
+++ b/src/main/java/com/google/gerrit/client/account/AccountMessages.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/AccountProjectWatchInfo.java b/src/main/java/com/google/gerrit/client/account/AccountProjectWatchInfo.java
index c9e9290ca2..1657f75d8a 100644
--- a/src/main/java/com/google/gerrit/client/account/AccountProjectWatchInfo.java
+++ b/src/main/java/com/google/gerrit/client/account/AccountProjectWatchInfo.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/AccountSecurity.java b/src/main/java/com/google/gerrit/client/account/AccountSecurity.java
index d7f7a7e386..7bb3fdc8f2 100644
--- a/src/main/java/com/google/gerrit/client/account/AccountSecurity.java
+++ b/src/main/java/com/google/gerrit/client/account/AccountSecurity.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/AccountService.java b/src/main/java/com/google/gerrit/client/account/AccountService.java
index dfc0468e63..f92b1604be 100644
--- a/src/main/java/com/google/gerrit/client/account/AccountService.java
+++ b/src/main/java/com/google/gerrit/client/account/AccountService.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/AccountServiceImpl.java b/src/main/java/com/google/gerrit/client/account/AccountServiceImpl.java
index c43ca0229b..37ed1cc518 100644
--- a/src/main/java/com/google/gerrit/client/account/AccountServiceImpl.java
+++ b/src/main/java/com/google/gerrit/client/account/AccountServiceImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/AccountSettings.java b/src/main/java/com/google/gerrit/client/account/AccountSettings.java
index f0b2de8c40..a2918fba60 100644
--- a/src/main/java/com/google/gerrit/client/account/AccountSettings.java
+++ b/src/main/java/com/google/gerrit/client/account/AccountSettings.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/AgreementInfo.java b/src/main/java/com/google/gerrit/client/account/AgreementInfo.java
index fc745469e3..1206665217 100644
--- a/src/main/java/com/google/gerrit/client/account/AgreementInfo.java
+++ b/src/main/java/com/google/gerrit/client/account/AgreementInfo.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/AgreementPanel.java b/src/main/java/com/google/gerrit/client/account/AgreementPanel.java
index 6fbbcd2b21..51c810a35f 100644
--- a/src/main/java/com/google/gerrit/client/account/AgreementPanel.java
+++ b/src/main/java/com/google/gerrit/client/account/AgreementPanel.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/ContactPanel.java b/src/main/java/com/google/gerrit/client/account/ContactPanel.java
index 55b6681e3e..11ce924b7d 100644
--- a/src/main/java/com/google/gerrit/client/account/ContactPanel.java
+++ b/src/main/java/com/google/gerrit/client/account/ContactPanel.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/ExternalIdDetail.java b/src/main/java/com/google/gerrit/client/account/ExternalIdDetail.java
index 55aa6165c8..e90f2929fe 100644
--- a/src/main/java/com/google/gerrit/client/account/ExternalIdDetail.java
+++ b/src/main/java/com/google/gerrit/client/account/ExternalIdDetail.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java b/src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java
index a3afa8cc56..ce47448610 100644
--- a/src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java
+++ b/src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/LoginService.java b/src/main/java/com/google/gerrit/client/account/LoginService.java
index 8c89cba9a3..1cb2389532 100644
--- a/src/main/java/com/google/gerrit/client/account/LoginService.java
+++ b/src/main/java/com/google/gerrit/client/account/LoginService.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java b/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java
index 301766b1ab..209c383f09 100644
--- a/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java
+++ b/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/PreferencePanel.java b/src/main/java/com/google/gerrit/client/account/PreferencePanel.java
index 34656678d4..4e53af4e69 100644
--- a/src/main/java/com/google/gerrit/client/account/PreferencePanel.java
+++ b/src/main/java/com/google/gerrit/client/account/PreferencePanel.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java b/src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java
index 3c33507ae3..e3e55a740c 100644
--- a/src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java
+++ b/src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/SignInResult.java b/src/main/java/com/google/gerrit/client/account/SignInResult.java
index d3dd417164..49ac8fbcda 100644
--- a/src/main/java/com/google/gerrit/client/account/SignInResult.java
+++ b/src/main/java/com/google/gerrit/client/account/SignInResult.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/SshKeyPanel.java b/src/main/java/com/google/gerrit/client/account/SshKeyPanel.java
index 1aacd241fc..06818245b7 100644
--- a/src/main/java/com/google/gerrit/client/account/SshKeyPanel.java
+++ b/src/main/java/com/google/gerrit/client/account/SshKeyPanel.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/Util.java b/src/main/java/com/google/gerrit/client/account/Util.java
index efffcb4ca2..705306d404 100644
--- a/src/main/java/com/google/gerrit/client/account/Util.java
+++ b/src/main/java/com/google/gerrit/client/account/Util.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java b/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java
index 8ce9a03a75..57d7c1df12 100644
--- a/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java
+++ b/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/admin/AccountGroupDetail.java b/src/main/java/com/google/gerrit/client/admin/AccountGroupDetail.java
index 7864e356ee..c1cef7b19a 100644
--- a/src/main/java/com/google/gerrit/client/admin/AccountGroupDetail.java
+++ b/src/main/java/com/google/gerrit/client/admin/AccountGroupDetail.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java b/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java
index e5c42b16e3..46fbb48ad1 100644
--- a/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java
+++ b/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/admin/AdminConstants.java b/src/main/java/com/google/gerrit/client/admin/AdminConstants.java
index 41c8df4c3f..d3b93df9f5 100644
--- a/src/main/java/com/google/gerrit/client/admin/AdminConstants.java
+++ b/src/main/java/com/google/gerrit/client/admin/AdminConstants.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/admin/AdminMessages.java b/src/main/java/com/google/gerrit/client/admin/AdminMessages.java
index e26ea516b8..ab3541e13b 100644
--- a/src/main/java/com/google/gerrit/client/admin/AdminMessages.java
+++ b/src/main/java/com/google/gerrit/client/admin/AdminMessages.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/admin/GroupAdminService.java b/src/main/java/com/google/gerrit/client/admin/GroupAdminService.java
index 41ac440407..3cdcd1546e 100644
--- a/src/main/java/com/google/gerrit/client/admin/GroupAdminService.java
+++ b/src/main/java/com/google/gerrit/client/admin/GroupAdminService.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java b/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java
index 9b9d7f8ed0..b9c341b64b 100644
--- a/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java
+++ b/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java b/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java
index f6d40563c3..c275797760 100644
--- a/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java
+++ b/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectAdminService.java b/src/main/java/com/google/gerrit/client/admin/ProjectAdminService.java
index 21da108bbf..d92e066d22 100644
--- a/src/main/java/com/google/gerrit/client/admin/ProjectAdminService.java
+++ b/src/main/java/com/google/gerrit/client/admin/ProjectAdminService.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectBranchesPanel.java b/src/main/java/com/google/gerrit/client/admin/ProjectBranchesPanel.java
index 0253fa88ee..f84fd44929 100644
--- a/src/main/java/com/google/gerrit/client/admin/ProjectBranchesPanel.java
+++ b/src/main/java/com/google/gerrit/client/admin/ProjectBranchesPanel.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectDetail.java b/src/main/java/com/google/gerrit/client/admin/ProjectDetail.java
index 75d7053de0..4b83065913 100644
--- a/src/main/java/com/google/gerrit/client/admin/ProjectDetail.java
+++ b/src/main/java/com/google/gerrit/client/admin/ProjectDetail.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectInfoPanel.java b/src/main/java/com/google/gerrit/client/admin/ProjectInfoPanel.java
index 5f4fd89fd1..e0c9f25283 100644
--- a/src/main/java/com/google/gerrit/client/admin/ProjectInfoPanel.java
+++ b/src/main/java/com/google/gerrit/client/admin/ProjectInfoPanel.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java b/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java
index 6da5be6a77..89959e2ced 100644
--- a/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java
+++ b/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectRightsPanel.java b/src/main/java/com/google/gerrit/client/admin/ProjectRightsPanel.java
index 658b66a719..477f3bd2e8 100644
--- a/src/main/java/com/google/gerrit/client/admin/ProjectRightsPanel.java
+++ b/src/main/java/com/google/gerrit/client/admin/ProjectRightsPanel.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/admin/Util.java b/src/main/java/com/google/gerrit/client/admin/Util.java
index 5de4377c80..9b87cf19df 100644
--- a/src/main/java/com/google/gerrit/client/admin/Util.java
+++ b/src/main/java/com/google/gerrit/client/admin/Util.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java b/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java
index 628379a480..0d0d93ed97 100644
--- a/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java
+++ b/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java b/src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java
index 2c0cef24a2..7396e41bbb 100644
--- a/src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java
+++ b/src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java b/src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java
index d69903d1d8..f9bf443449 100644
--- a/src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java
+++ b/src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/AllOpenChangesScreen.java b/src/main/java/com/google/gerrit/client/changes/AllOpenChangesScreen.java
index 36f7a569af..389441e7d2 100644
--- a/src/main/java/com/google/gerrit/client/changes/AllOpenChangesScreen.java
+++ b/src/main/java/com/google/gerrit/client/changes/AllOpenChangesScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java b/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java
index 2bf9bbe031..43f907ff8d 100644
--- a/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java
+++ b/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java b/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java
index 261a05d16e..728824600f 100644
--- a/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java
+++ b/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java b/src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java
index 8d67f2da08..c848783e4e 100644
--- a/src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java
+++ b/src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java b/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java
index cf62564f11..afc1555b9b 100644
--- a/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java
+++ b/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java b/src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java
index cdb7a97bd3..eadb12fd1d 100644
--- a/src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java
+++ b/src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeDetailService.java b/src/main/java/com/google/gerrit/client/changes/ChangeDetailService.java
index 7f25917a2d..af2d63dfe5 100644
--- a/src/main/java/com/google/gerrit/client/changes/ChangeDetailService.java
+++ b/src/main/java/com/google/gerrit/client/changes/ChangeDetailService.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeDetailServiceImpl.java b/src/main/java/com/google/gerrit/client/changes/ChangeDetailServiceImpl.java
index c988254bec..959ced2deb 100644
--- a/src/main/java/com/google/gerrit/client/changes/ChangeDetailServiceImpl.java
+++ b/src/main/java/com/google/gerrit/client/changes/ChangeDetailServiceImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java b/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java
index da085e7310..9f317a727a 100644
--- a/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java
+++ b/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeListService.java b/src/main/java/com/google/gerrit/client/changes/ChangeListService.java
index 58460976ba..f5f727b7c7 100644
--- a/src/main/java/com/google/gerrit/client/changes/ChangeListService.java
+++ b/src/main/java/com/google/gerrit/client/changes/ChangeListService.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeListServiceImpl.java b/src/main/java/com/google/gerrit/client/changes/ChangeListServiceImpl.java
index 3fccd450d1..303e921f00 100644
--- a/src/main/java/com/google/gerrit/client/changes/ChangeListServiceImpl.java
+++ b/src/main/java/com/google/gerrit/client/changes/ChangeListServiceImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeManageService.java b/src/main/java/com/google/gerrit/client/changes/ChangeManageService.java
index a2a7b186fb..d4a19b1e8e 100644
--- a/src/main/java/com/google/gerrit/client/changes/ChangeManageService.java
+++ b/src/main/java/com/google/gerrit/client/changes/ChangeManageService.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java b/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java
index 5fc0a46812..ce7cc35668 100644
--- a/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java
+++ b/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java b/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
index 1175c5e956..6f87bc2290 100644
--- a/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
+++ b/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeTable.java b/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
index c3687956c2..66a570ea72 100644
--- a/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
+++ b/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/MessagePanel.java b/src/main/java/com/google/gerrit/client/changes/MessagePanel.java
index fbb23d5943..ccf8a09bbd 100644
--- a/src/main/java/com/google/gerrit/client/changes/MessagePanel.java
+++ b/src/main/java/com/google/gerrit/client/changes/MessagePanel.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java b/src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java
index 98652f4bd8..171b4c60fe 100644
--- a/src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java
+++ b/src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java b/src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java
index 8ec8501b86..67aa70c4e6 100644
--- a/src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java
+++ b/src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java b/src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java
index f5ffea3bcd..ea94ed5dd5 100644
--- a/src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java
+++ b/src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java b/src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java
index 4d110b5b42..0bf1c3fa4d 100644
--- a/src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java
+++ b/src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/PatchSetPublishDetail.java b/src/main/java/com/google/gerrit/client/changes/PatchSetPublishDetail.java
index 61d6b7b63b..70800247a8 100644
--- a/src/main/java/com/google/gerrit/client/changes/PatchSetPublishDetail.java
+++ b/src/main/java/com/google/gerrit/client/changes/PatchSetPublishDetail.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/PatchTable.java b/src/main/java/com/google/gerrit/client/changes/PatchTable.java
index b0cf08f75c..101d75445f 100644
--- a/src/main/java/com/google/gerrit/client/changes/PatchTable.java
+++ b/src/main/java/com/google/gerrit/client/changes/PatchTable.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java b/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java
index 7f774728f8..cb595c0c8d 100644
--- a/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java
+++ b/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java b/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java
index ed76729be0..4a11235ed9 100644
--- a/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java
+++ b/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/changes/Util.java b/src/main/java/com/google/gerrit/client/changes/Util.java
index 5a2e9442cf..9461edb4f7 100644
--- a/src/main/java/com/google/gerrit/client/changes/Util.java
+++ b/src/main/java/com/google/gerrit/client/changes/Util.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/AccountCache.java b/src/main/java/com/google/gerrit/client/data/AccountCache.java
index db2424f1c2..82d8bd52af 100644
--- a/src/main/java/com/google/gerrit/client/data/AccountCache.java
+++ b/src/main/java/com/google/gerrit/client/data/AccountCache.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/AccountDashboardInfo.java b/src/main/java/com/google/gerrit/client/data/AccountDashboardInfo.java
index e17ef5e4c4..23d1620e51 100644
--- a/src/main/java/com/google/gerrit/client/data/AccountDashboardInfo.java
+++ b/src/main/java/com/google/gerrit/client/data/AccountDashboardInfo.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/AccountInfo.java b/src/main/java/com/google/gerrit/client/data/AccountInfo.java
index bdfd787a3c..aa3c893985 100644
--- a/src/main/java/com/google/gerrit/client/data/AccountInfo.java
+++ b/src/main/java/com/google/gerrit/client/data/AccountInfo.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/AccountInfoCache.java b/src/main/java/com/google/gerrit/client/data/AccountInfoCache.java
index 5aafa5d256..e327f2a4f3 100644
--- a/src/main/java/com/google/gerrit/client/data/AccountInfoCache.java
+++ b/src/main/java/com/google/gerrit/client/data/AccountInfoCache.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/AccountInfoCacheFactory.java b/src/main/java/com/google/gerrit/client/data/AccountInfoCacheFactory.java
index ffb351a860..1fabf716d0 100644
--- a/src/main/java/com/google/gerrit/client/data/AccountInfoCacheFactory.java
+++ b/src/main/java/com/google/gerrit/client/data/AccountInfoCacheFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/ApprovalDetail.java b/src/main/java/com/google/gerrit/client/data/ApprovalDetail.java
index f307fefda4..b5f1d2b74e 100644
--- a/src/main/java/com/google/gerrit/client/data/ApprovalDetail.java
+++ b/src/main/java/com/google/gerrit/client/data/ApprovalDetail.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/ApprovalType.java b/src/main/java/com/google/gerrit/client/data/ApprovalType.java
index 4fde172415..95950eaacc 100644
--- a/src/main/java/com/google/gerrit/client/data/ApprovalType.java
+++ b/src/main/java/com/google/gerrit/client/data/ApprovalType.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/BasePatchDetail.java b/src/main/java/com/google/gerrit/client/data/BasePatchDetail.java
index 651d7ba146..dc33aa58b7 100644
--- a/src/main/java/com/google/gerrit/client/data/BasePatchDetail.java
+++ b/src/main/java/com/google/gerrit/client/data/BasePatchDetail.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/ChangeDetail.java b/src/main/java/com/google/gerrit/client/data/ChangeDetail.java
index 25e8b31f7d..036de1e977 100644
--- a/src/main/java/com/google/gerrit/client/data/ChangeDetail.java
+++ b/src/main/java/com/google/gerrit/client/data/ChangeDetail.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/ChangeInfo.java b/src/main/java/com/google/gerrit/client/data/ChangeInfo.java
index a410c459e6..ad0f7d1b57 100644
--- a/src/main/java/com/google/gerrit/client/data/ChangeInfo.java
+++ b/src/main/java/com/google/gerrit/client/data/ChangeInfo.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/GerritConfig.java b/src/main/java/com/google/gerrit/client/data/GerritConfig.java
index 107c1009cd..f35aee4d72 100644
--- a/src/main/java/com/google/gerrit/client/data/GerritConfig.java
+++ b/src/main/java/com/google/gerrit/client/data/GerritConfig.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/GitwebLink.java b/src/main/java/com/google/gerrit/client/data/GitwebLink.java
index b6ec7a09dd..e293e86758 100644
--- a/src/main/java/com/google/gerrit/client/data/GitwebLink.java
+++ b/src/main/java/com/google/gerrit/client/data/GitwebLink.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/GroupCache.java b/src/main/java/com/google/gerrit/client/data/GroupCache.java
index ade958be13..276716e171 100644
--- a/src/main/java/com/google/gerrit/client/data/GroupCache.java
+++ b/src/main/java/com/google/gerrit/client/data/GroupCache.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/LineWithComments.java b/src/main/java/com/google/gerrit/client/data/LineWithComments.java
index 3e7fb27ab0..03b65adec0 100644
--- a/src/main/java/com/google/gerrit/client/data/LineWithComments.java
+++ b/src/main/java/com/google/gerrit/client/data/LineWithComments.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/PatchLine.java b/src/main/java/com/google/gerrit/client/data/PatchLine.java
index 7c6ed59461..df43e32347 100644
--- a/src/main/java/com/google/gerrit/client/data/PatchLine.java
+++ b/src/main/java/com/google/gerrit/client/data/PatchLine.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/PatchSetDetail.java b/src/main/java/com/google/gerrit/client/data/PatchSetDetail.java
index 53992163db..a8831bca4f 100644
--- a/src/main/java/com/google/gerrit/client/data/PatchSetDetail.java
+++ b/src/main/java/com/google/gerrit/client/data/PatchSetDetail.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/ProjectCache.java b/src/main/java/com/google/gerrit/client/data/ProjectCache.java
index db1c0f56bc..11fa6d10af 100644
--- a/src/main/java/com/google/gerrit/client/data/ProjectCache.java
+++ b/src/main/java/com/google/gerrit/client/data/ProjectCache.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/ProjectInfo.java b/src/main/java/com/google/gerrit/client/data/ProjectInfo.java
index 714fcb45e2..e56efd37ac 100644
--- a/src/main/java/com/google/gerrit/client/data/ProjectInfo.java
+++ b/src/main/java/com/google/gerrit/client/data/ProjectInfo.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/SideBySideLine.java b/src/main/java/com/google/gerrit/client/data/SideBySideLine.java
index 3f0537ad3b..d5b2cf7014 100644
--- a/src/main/java/com/google/gerrit/client/data/SideBySideLine.java
+++ b/src/main/java/com/google/gerrit/client/data/SideBySideLine.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/SideBySidePatchDetail.java b/src/main/java/com/google/gerrit/client/data/SideBySidePatchDetail.java
index f2b63f6f27..11e880f953 100644
--- a/src/main/java/com/google/gerrit/client/data/SideBySidePatchDetail.java
+++ b/src/main/java/com/google/gerrit/client/data/SideBySidePatchDetail.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/SingleListChangeInfo.java b/src/main/java/com/google/gerrit/client/data/SingleListChangeInfo.java
index 720cf217f2..26543e362c 100644
--- a/src/main/java/com/google/gerrit/client/data/SingleListChangeInfo.java
+++ b/src/main/java/com/google/gerrit/client/data/SingleListChangeInfo.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/SystemInfoService.java b/src/main/java/com/google/gerrit/client/data/SystemInfoService.java
index 45418e3cb6..5c07ff281a 100644
--- a/src/main/java/com/google/gerrit/client/data/SystemInfoService.java
+++ b/src/main/java/com/google/gerrit/client/data/SystemInfoService.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/data/UnifiedPatchDetail.java b/src/main/java/com/google/gerrit/client/data/UnifiedPatchDetail.java
index 8280231077..b8181b1d1b 100644
--- a/src/main/java/com/google/gerrit/client/data/UnifiedPatchDetail.java
+++ b/src/main/java/com/google/gerrit/client/data/UnifiedPatchDetail.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/openid/AllowFrameImpl.java b/src/main/java/com/google/gerrit/client/openid/AllowFrameImpl.java
index b5d4e95c35..6f58c8b644 100644
--- a/src/main/java/com/google/gerrit/client/openid/AllowFrameImpl.java
+++ b/src/main/java/com/google/gerrit/client/openid/AllowFrameImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/openid/AllowFrameImplSafari.java b/src/main/java/com/google/gerrit/client/openid/AllowFrameImplSafari.java
index c093b8743f..e0db8b01f5 100644
--- a/src/main/java/com/google/gerrit/client/openid/AllowFrameImplSafari.java
+++ b/src/main/java/com/google/gerrit/client/openid/AllowFrameImplSafari.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/openid/DiscoveryResult.java b/src/main/java/com/google/gerrit/client/openid/DiscoveryResult.java
index 06032b09fa..91b18be370 100644
--- a/src/main/java/com/google/gerrit/client/openid/DiscoveryResult.java
+++ b/src/main/java/com/google/gerrit/client/openid/DiscoveryResult.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/openid/LoginConstants.java b/src/main/java/com/google/gerrit/client/openid/LoginConstants.java
index 965a9ef54d..e96016278e 100644
--- a/src/main/java/com/google/gerrit/client/openid/LoginConstants.java
+++ b/src/main/java/com/google/gerrit/client/openid/LoginConstants.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/openid/LoginIcons.java b/src/main/java/com/google/gerrit/client/openid/LoginIcons.java
index 3cc1715a4a..cb37c844b7 100644
--- a/src/main/java/com/google/gerrit/client/openid/LoginIcons.java
+++ b/src/main/java/com/google/gerrit/client/openid/LoginIcons.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/openid/LoginMessages.java b/src/main/java/com/google/gerrit/client/openid/LoginMessages.java
index eb038a6594..75f3a8b243 100644
--- a/src/main/java/com/google/gerrit/client/openid/LoginMessages.java
+++ b/src/main/java/com/google/gerrit/client/openid/LoginMessages.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/openid/OpenIdLoginPanel.java b/src/main/java/com/google/gerrit/client/openid/OpenIdLoginPanel.java
index 4d3fc9944e..f80452d3a1 100644
--- a/src/main/java/com/google/gerrit/client/openid/OpenIdLoginPanel.java
+++ b/src/main/java/com/google/gerrit/client/openid/OpenIdLoginPanel.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/openid/OpenIdService.java b/src/main/java/com/google/gerrit/client/openid/OpenIdService.java
index 56a84e5500..ff76a08700 100644
--- a/src/main/java/com/google/gerrit/client/openid/OpenIdService.java
+++ b/src/main/java/com/google/gerrit/client/openid/OpenIdService.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/openid/OpenIdUtil.java b/src/main/java/com/google/gerrit/client/openid/OpenIdUtil.java
index 77fb760976..24072c04a8 100644
--- a/src/main/java/com/google/gerrit/client/openid/OpenIdUtil.java
+++ b/src/main/java/com/google/gerrit/client/openid/OpenIdUtil.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java b/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java
index f9e109791b..618412fa3a 100644
--- a/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java
+++ b/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/patches/LineCommentPanel.java b/src/main/java/com/google/gerrit/client/patches/LineCommentPanel.java
index 97a1225087..e9f3acce35 100644
--- a/src/main/java/com/google/gerrit/client/patches/LineCommentPanel.java
+++ b/src/main/java/com/google/gerrit/client/patches/LineCommentPanel.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/patches/PatchConstants.java b/src/main/java/com/google/gerrit/client/patches/PatchConstants.java
index c1736d6dec..5d16faf353 100644
--- a/src/main/java/com/google/gerrit/client/patches/PatchConstants.java
+++ b/src/main/java/com/google/gerrit/client/patches/PatchConstants.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java b/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java
index a76713e920..7d00318975 100644
--- a/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java
+++ b/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/patches/PatchMessages.java b/src/main/java/com/google/gerrit/client/patches/PatchMessages.java
index 2f2b6abd1b..49521f4e76 100644
--- a/src/main/java/com/google/gerrit/client/patches/PatchMessages.java
+++ b/src/main/java/com/google/gerrit/client/patches/PatchMessages.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/patches/PatchScreen.java b/src/main/java/com/google/gerrit/client/patches/PatchScreen.java
index 26ecce0d79..e315346d44 100644
--- a/src/main/java/com/google/gerrit/client/patches/PatchScreen.java
+++ b/src/main/java/com/google/gerrit/client/patches/PatchScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/patches/PatchSideBySideScreen.java b/src/main/java/com/google/gerrit/client/patches/PatchSideBySideScreen.java
index 0a0f0bd219..99ff68540f 100644
--- a/src/main/java/com/google/gerrit/client/patches/PatchSideBySideScreen.java
+++ b/src/main/java/com/google/gerrit/client/patches/PatchSideBySideScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/patches/PatchUnifiedScreen.java b/src/main/java/com/google/gerrit/client/patches/PatchUnifiedScreen.java
index cb45cece74..60c7c571fa 100644
--- a/src/main/java/com/google/gerrit/client/patches/PatchUnifiedScreen.java
+++ b/src/main/java/com/google/gerrit/client/patches/PatchUnifiedScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/patches/PatchUtil.java b/src/main/java/com/google/gerrit/client/patches/PatchUtil.java
index 70206c79a8..5aff868c65 100644
--- a/src/main/java/com/google/gerrit/client/patches/PatchUtil.java
+++ b/src/main/java/com/google/gerrit/client/patches/PatchUtil.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java b/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java
index f343479c2b..85bda4c384 100644
--- a/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java
+++ b/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java b/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java
index c071e8879e..e781fdbfa4 100644
--- a/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java
+++ b/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/Account.java b/src/main/java/com/google/gerrit/client/reviewdb/Account.java
index 2100ebba04..4ae6e771d4 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/Account.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/Account.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountAccess.java
index 794b20ce93..f6e3707908 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/AccountAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/AccountAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreement.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreement.java
index 67a192a98e..3eb9240344 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreement.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreement.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java
index 1745526276..7628d7a8ea 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalId.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalId.java
index ecbb07b662..bffc5a1ba8 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalId.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalId.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java
index 5cd2998d59..a6ac5ce667 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroup.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountGroup.java
index f366f1d33c..43d5db26cd 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroup.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/AccountGroup.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAccess.java
index 6f8c0859a1..c99818d362 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMember.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMember.java
index d2ee1e8abe..61af961be6 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMember.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMember.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java
index d5ea0e32bb..8a18919170 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatch.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatch.java
index 0c4053123f..b44edc2380 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatch.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatch.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatchAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatchAccess.java
index 9b2a29d4cb..0ef0015b32 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatchAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatchAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKey.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKey.java
index 6553c32f89..68444bc1c6 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKey.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKey.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKeyAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKeyAccess.java
index 1497ea8782..10f4935002 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKeyAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKeyAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java b/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java
index d2d0de3823..93cc96d49e 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java
index abe5ca3ef4..45df69933e 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java b/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java
index c37c29d048..ff4ddaed14 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java
index 15f1afb1ca..9b8a64c15c 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/Branch.java b/src/main/java/com/google/gerrit/client/reviewdb/Branch.java
index 4d45838aec..06577dff43 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/Branch.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/Branch.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/BranchAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/BranchAccess.java
index 0f8c47801d..171fe6762e 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/BranchAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/BranchAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/Change.java b/src/main/java/com/google/gerrit/client/reviewdb/Change.java
index 0a39e0fe8f..49d00473b7 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/Change.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/Change.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ChangeAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ChangeAccess.java
index 4a19c7619c..8d34c72458 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ChangeAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ChangeAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ChangeApproval.java b/src/main/java/com/google/gerrit/client/reviewdb/ChangeApproval.java
index fb8c659731..4a346ab226 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ChangeApproval.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ChangeApproval.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ChangeApprovalAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ChangeApprovalAccess.java
index e2446ca182..36955cb3a6 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ChangeApprovalAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ChangeApprovalAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessage.java b/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessage.java
index dd0be0ca59..5e8ce2941f 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessage.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessage.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java
index 106a07f481..da95329f2d 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ContactInformation.java b/src/main/java/com/google/gerrit/client/reviewdb/ContactInformation.java
index ac79edebf8..660e66aa48 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ContactInformation.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ContactInformation.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java b/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java
index cfa5c016d8..ce6c027c03 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java
index ac6ac809a9..9c40c90714 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/Patch.java b/src/main/java/com/google/gerrit/client/reviewdb/Patch.java
index e3f0d2fefd..2ac6d316d0 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/Patch.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/Patch.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchAccess.java
index de49626855..7843146eed 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/PatchAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/PatchAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchContent.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchContent.java
index 4d2224fe12..8eef8b3fa7 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/PatchContent.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/PatchContent.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchContentAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchContentAccess.java
index 4d6e21d305..896ab207a0 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/PatchContentAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/PatchContentAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchLineComment.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchLineComment.java
index 760a07740e..64bad4a368 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/PatchLineComment.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/PatchLineComment.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java
index 3c610a5065..589956d859 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchSet.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchSet.java
index 9e75cce222..5b53eb6037 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/PatchSet.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/PatchSet.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAccess.java
index 2819b873b1..72df200b39 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestor.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestor.java
index f2267bbf98..092d2f1ea0 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestor.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestor.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java
index 4b6274b975..d492fa5cf8 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfo.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfo.java
index a9b32d91dd..7f3db23370 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfo.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfo.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfoAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfoAccess.java
index 1682cb7a8e..3018b8b9f4 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfoAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfoAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/Project.java b/src/main/java/com/google/gerrit/client/reviewdb/Project.java
index 5dc5e06470..4a9f0f2ea7 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/Project.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/Project.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ProjectAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ProjectAccess.java
index 566c178fe0..fda6ad1b99 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ProjectAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ProjectAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ProjectRight.java b/src/main/java/com/google/gerrit/client/reviewdb/ProjectRight.java
index 7c2f3e89a6..20e536e1d2 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ProjectRight.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ProjectRight.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ProjectRightAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ProjectRightAccess.java
index 9c385b2373..9c1d70764d 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ProjectRightAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ProjectRightAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/RevId.java b/src/main/java/com/google/gerrit/client/reviewdb/RevId.java
index 76c945d758..642fe7a876 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/RevId.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/RevId.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ReviewDb.java b/src/main/java/com/google/gerrit/client/reviewdb/ReviewDb.java
index 1bf1e5fff6..411621d68d 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/ReviewDb.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/ReviewDb.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersion.java b/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersion.java
index f4117bae04..0ea87e6da8 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersion.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersion.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersionAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersionAccess.java
index 902ce96467..ba37b7aa1c 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersionAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersionAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/StarredChange.java b/src/main/java/com/google/gerrit/client/reviewdb/StarredChange.java
index d10b74f6f0..daa8e3bfc6 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/StarredChange.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/StarredChange.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/StarredChangeAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/StarredChangeAccess.java
index 391d8b2e25..98e932855c 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/StarredChangeAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/StarredChangeAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/SystemConfig.java b/src/main/java/com/google/gerrit/client/reviewdb/SystemConfig.java
index 087fa78d52..6d09a0bf24 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/SystemConfig.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/SystemConfig.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/SystemConfigAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/SystemConfigAccess.java
index 6aa428b081..b72c9c5977 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/SystemConfigAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/SystemConfigAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/TrustedExternalId.java b/src/main/java/com/google/gerrit/client/reviewdb/TrustedExternalId.java
index 0268918085..c8cba79d67 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/TrustedExternalId.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/TrustedExternalId.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/TrustedExternalIdAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/TrustedExternalIdAccess.java
index 9d345af38c..e7979de870 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/TrustedExternalIdAccess.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/TrustedExternalIdAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/reviewdb/UserIdentity.java b/src/main/java/com/google/gerrit/client/reviewdb/UserIdentity.java
index 876367d377..dacccbc414 100644
--- a/src/main/java/com/google/gerrit/client/reviewdb/UserIdentity.java
+++ b/src/main/java/com/google/gerrit/client/reviewdb/UserIdentity.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/BaseServiceImplementation.java b/src/main/java/com/google/gerrit/client/rpc/BaseServiceImplementation.java
index a321ae04ba..2c93ba5c3c 100644
--- a/src/main/java/com/google/gerrit/client/rpc/BaseServiceImplementation.java
+++ b/src/main/java/com/google/gerrit/client/rpc/BaseServiceImplementation.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/Common.java b/src/main/java/com/google/gerrit/client/rpc/Common.java
index 8166d6c4ae..6da663560e 100644
--- a/src/main/java/com/google/gerrit/client/rpc/Common.java
+++ b/src/main/java/com/google/gerrit/client/rpc/Common.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/ContactInformationStoreException.java b/src/main/java/com/google/gerrit/client/rpc/ContactInformationStoreException.java
index 98e4582913..62334f5567 100644
--- a/src/main/java/com/google/gerrit/client/rpc/ContactInformationStoreException.java
+++ b/src/main/java/com/google/gerrit/client/rpc/ContactInformationStoreException.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/CorruptEntityException.java b/src/main/java/com/google/gerrit/client/rpc/CorruptEntityException.java
index 1f34540d77..5a788fbe2d 100644
--- a/src/main/java/com/google/gerrit/client/rpc/CorruptEntityException.java
+++ b/src/main/java/com/google/gerrit/client/rpc/CorruptEntityException.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java b/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java
index cd163ed481..d3ec368fd5 100644
--- a/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java
+++ b/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/InvalidNameException.java b/src/main/java/com/google/gerrit/client/rpc/InvalidNameException.java
index c32eeebd2d..eb57a44225 100644
--- a/src/main/java/com/google/gerrit/client/rpc/InvalidNameException.java
+++ b/src/main/java/com/google/gerrit/client/rpc/InvalidNameException.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/InvalidRevisionException.java b/src/main/java/com/google/gerrit/client/rpc/InvalidRevisionException.java
index 801c6d24fc..fcdb4dd4fc 100644
--- a/src/main/java/com/google/gerrit/client/rpc/InvalidRevisionException.java
+++ b/src/main/java/com/google/gerrit/client/rpc/InvalidRevisionException.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/InvalidSshKeyException.java b/src/main/java/com/google/gerrit/client/rpc/InvalidSshKeyException.java
index 7fb01ab6d8..9fd4abb481 100644
--- a/src/main/java/com/google/gerrit/client/rpc/InvalidSshKeyException.java
+++ b/src/main/java/com/google/gerrit/client/rpc/InvalidSshKeyException.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/NameAlreadyUsedException.java b/src/main/java/com/google/gerrit/client/rpc/NameAlreadyUsedException.java
index b65282effd..77acdea797 100644
--- a/src/main/java/com/google/gerrit/client/rpc/NameAlreadyUsedException.java
+++ b/src/main/java/com/google/gerrit/client/rpc/NameAlreadyUsedException.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/NoDifferencesException.java b/src/main/java/com/google/gerrit/client/rpc/NoDifferencesException.java
index b503be86e7..b3462bcf68 100644
--- a/src/main/java/com/google/gerrit/client/rpc/NoDifferencesException.java
+++ b/src/main/java/com/google/gerrit/client/rpc/NoDifferencesException.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/NoSuchEntityException.java b/src/main/java/com/google/gerrit/client/rpc/NoSuchEntityException.java
index a6bde9424f..4a6beca247 100644
--- a/src/main/java/com/google/gerrit/client/rpc/NoSuchEntityException.java
+++ b/src/main/java/com/google/gerrit/client/rpc/NoSuchEntityException.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/NotSignedInException.java b/src/main/java/com/google/gerrit/client/rpc/NotSignedInException.java
index 9418b669e3..e46102bcd9 100644
--- a/src/main/java/com/google/gerrit/client/rpc/NotSignedInException.java
+++ b/src/main/java/com/google/gerrit/client/rpc/NotSignedInException.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java b/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java
index afa4202a9f..1442b34deb 100644
--- a/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java
+++ b/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java b/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java
index e7e07a50f3..c2855fac6d 100644
--- a/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java
+++ b/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/rpc/SignInRequired.java b/src/main/java/com/google/gerrit/client/rpc/SignInRequired.java
index a587dcdb29..7fdbb6f60d 100644
--- a/src/main/java/com/google/gerrit/client/rpc/SignInRequired.java
+++ b/src/main/java/com/google/gerrit/client/rpc/SignInRequired.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java b/src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java
index 6560904d6d..9758c920da 100644
--- a/src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java
+++ b/src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java b/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java
index d77a6c10a5..e0a497a9be 100644
--- a/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java
+++ b/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/AccountScreen.java b/src/main/java/com/google/gerrit/client/ui/AccountScreen.java
index d73eaa5d63..2594e52b19 100644
--- a/src/main/java/com/google/gerrit/client/ui/AccountScreen.java
+++ b/src/main/java/com/google/gerrit/client/ui/AccountScreen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java b/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java
index 981024e6a0..51da314f37 100644
--- a/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java
+++ b/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/ChangeLink.java b/src/main/java/com/google/gerrit/client/ui/ChangeLink.java
index 42ec56d337..f71bb248cd 100644
--- a/src/main/java/com/google/gerrit/client/ui/ChangeLink.java
+++ b/src/main/java/com/google/gerrit/client/ui/ChangeLink.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java b/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java
index 838bcceacb..2cb01d6dfd 100644
--- a/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java
+++ b/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java b/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java
index 20176504bf..69f9d809db 100644
--- a/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java
+++ b/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java b/src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java
index 6fd7329a73..6f682ab63b 100644
--- a/src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java
+++ b/src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java b/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java
index a3beabbc72..1c58e862bd 100644
--- a/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java
+++ b/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java b/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java
index d11919e0b0..c72969e5b6 100644
--- a/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java
+++ b/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE6.java b/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE6.java
index de0c07de8c..17e8ddd723 100644
--- a/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE6.java
+++ b/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE6.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/LazyTabChild.java b/src/main/java/com/google/gerrit/client/ui/LazyTabChild.java
index d5ccfca3d5..903f8c534b 100644
--- a/src/main/java/com/google/gerrit/client/ui/LazyTabChild.java
+++ b/src/main/java/com/google/gerrit/client/ui/LazyTabChild.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java b/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java
index d14d515978..a0055f4de8 100644
--- a/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java
+++ b/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java b/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java
index c3910ba9c5..df98c67d32 100644
--- a/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java
+++ b/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/PatchLink.java b/src/main/java/com/google/gerrit/client/ui/PatchLink.java
index 34bc51c960..f60c7b04a5 100644
--- a/src/main/java/com/google/gerrit/client/ui/PatchLink.java
+++ b/src/main/java/com/google/gerrit/client/ui/PatchLink.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java b/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java
index 3d003b11e8..86195490aa 100644
--- a/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java
+++ b/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/ProjectOpenLink.java b/src/main/java/com/google/gerrit/client/ui/ProjectOpenLink.java
index 446ff18dca..1d3e214269 100644
--- a/src/main/java/com/google/gerrit/client/ui/ProjectOpenLink.java
+++ b/src/main/java/com/google/gerrit/client/ui/ProjectOpenLink.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/RefreshListener.java b/src/main/java/com/google/gerrit/client/ui/RefreshListener.java
index f426dfb950..5f0c90aa74 100644
--- a/src/main/java/com/google/gerrit/client/ui/RefreshListener.java
+++ b/src/main/java/com/google/gerrit/client/ui/RefreshListener.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/Screen.java b/src/main/java/com/google/gerrit/client/ui/Screen.java
index 4dd4215798..342d2adf33 100644
--- a/src/main/java/com/google/gerrit/client/ui/Screen.java
+++ b/src/main/java/com/google/gerrit/client/ui/Screen.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/SmallHeading.java b/src/main/java/com/google/gerrit/client/ui/SmallHeading.java
index efadd340ee..153af6c0a1 100644
--- a/src/main/java/com/google/gerrit/client/ui/SmallHeading.java
+++ b/src/main/java/com/google/gerrit/client/ui/SmallHeading.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/SuggestService.java b/src/main/java/com/google/gerrit/client/ui/SuggestService.java
index be27bb22e4..dd841652c7 100644
--- a/src/main/java/com/google/gerrit/client/ui/SuggestService.java
+++ b/src/main/java/com/google/gerrit/client/ui/SuggestService.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/SuggestServiceImpl.java b/src/main/java/com/google/gerrit/client/ui/SuggestServiceImpl.java
index 1ba5643fb2..ad75ed1aed 100644
--- a/src/main/java/com/google/gerrit/client/ui/SuggestServiceImpl.java
+++ b/src/main/java/com/google/gerrit/client/ui/SuggestServiceImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/SuggestUtil.java b/src/main/java/com/google/gerrit/client/ui/SuggestUtil.java
index d904e96fbc..81d11c4f83 100644
--- a/src/main/java/com/google/gerrit/client/ui/SuggestUtil.java
+++ b/src/main/java/com/google/gerrit/client/ui/SuggestUtil.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/ui/TextSaveButtonListener.java b/src/main/java/com/google/gerrit/client/ui/TextSaveButtonListener.java
index cf63488784..4580ba0cab 100644
--- a/src/main/java/com/google/gerrit/client/ui/TextSaveButtonListener.java
+++ b/src/main/java/com/google/gerrit/client/ui/TextSaveButtonListener.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/workflow/CategoryFunction.java b/src/main/java/com/google/gerrit/client/workflow/CategoryFunction.java
index ea167b7329..2127b3f25d 100644
--- a/src/main/java/com/google/gerrit/client/workflow/CategoryFunction.java
+++ b/src/main/java/com/google/gerrit/client/workflow/CategoryFunction.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/workflow/FunctionState.java b/src/main/java/com/google/gerrit/client/workflow/FunctionState.java
index f6243bf38f..14b61a42d5 100644
--- a/src/main/java/com/google/gerrit/client/workflow/FunctionState.java
+++ b/src/main/java/com/google/gerrit/client/workflow/FunctionState.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/workflow/MaxWithBlock.java b/src/main/java/com/google/gerrit/client/workflow/MaxWithBlock.java
index 3564b3acc3..1aecb2616f 100644
--- a/src/main/java/com/google/gerrit/client/workflow/MaxWithBlock.java
+++ b/src/main/java/com/google/gerrit/client/workflow/MaxWithBlock.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/workflow/NoOpFunction.java b/src/main/java/com/google/gerrit/client/workflow/NoOpFunction.java
index 19555e037f..52d450f054 100644
--- a/src/main/java/com/google/gerrit/client/workflow/NoOpFunction.java
+++ b/src/main/java/com/google/gerrit/client/workflow/NoOpFunction.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/client/workflow/SubmitFunction.java b/src/main/java/com/google/gerrit/client/workflow/SubmitFunction.java
index 008b1603c5..7520568ce8 100644
--- a/src/main/java/com/google/gerrit/client/workflow/SubmitFunction.java
+++ b/src/main/java/com/google/gerrit/client/workflow/SubmitFunction.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/git/CodeReviewCommit.java b/src/main/java/com/google/gerrit/git/CodeReviewCommit.java
index 8f1bca9d04..c4a898e9d7 100644
--- a/src/main/java/com/google/gerrit/git/CodeReviewCommit.java
+++ b/src/main/java/com/google/gerrit/git/CodeReviewCommit.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/git/CommitMergeStatus.java b/src/main/java/com/google/gerrit/git/CommitMergeStatus.java
index 89c2007275..ed58007dd1 100644
--- a/src/main/java/com/google/gerrit/git/CommitMergeStatus.java
+++ b/src/main/java/com/google/gerrit/git/CommitMergeStatus.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/git/GitMetaUtil.java b/src/main/java/com/google/gerrit/git/GitMetaUtil.java
index 2bb3ee1331..4b69706c87 100644
--- a/src/main/java/com/google/gerrit/git/GitMetaUtil.java
+++ b/src/main/java/com/google/gerrit/git/GitMetaUtil.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/git/InvalidRepositoryException.java b/src/main/java/com/google/gerrit/git/InvalidRepositoryException.java
index 0686f21a75..a2957ccf0b 100644
--- a/src/main/java/com/google/gerrit/git/InvalidRepositoryException.java
+++ b/src/main/java/com/google/gerrit/git/InvalidRepositoryException.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/git/MergeException.java b/src/main/java/com/google/gerrit/git/MergeException.java
index 9529811dee..6ef83918d4 100644
--- a/src/main/java/com/google/gerrit/git/MergeException.java
+++ b/src/main/java/com/google/gerrit/git/MergeException.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/git/MergeOp.java b/src/main/java/com/google/gerrit/git/MergeOp.java
index bde95936c1..923ac396cc 100644
--- a/src/main/java/com/google/gerrit/git/MergeOp.java
+++ b/src/main/java/com/google/gerrit/git/MergeOp.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/git/MergeQueue.java b/src/main/java/com/google/gerrit/git/MergeQueue.java
index 4099a87621..8a487ca30e 100644
--- a/src/main/java/com/google/gerrit/git/MergeQueue.java
+++ b/src/main/java/com/google/gerrit/git/MergeQueue.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/git/MergeSorter.java b/src/main/java/com/google/gerrit/git/MergeSorter.java
index 59c2beb748..b57c58094c 100644
--- a/src/main/java/com/google/gerrit/git/MergeSorter.java
+++ b/src/main/java/com/google/gerrit/git/MergeSorter.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/git/PatchSetImporter.java b/src/main/java/com/google/gerrit/git/PatchSetImporter.java
index 3a57f70421..fbdf1ee0fa 100644
--- a/src/main/java/com/google/gerrit/git/PatchSetImporter.java
+++ b/src/main/java/com/google/gerrit/git/PatchSetImporter.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/git/PushQueue.java b/src/main/java/com/google/gerrit/git/PushQueue.java
index d9cc77c91d..28d0902d20 100644
--- a/src/main/java/com/google/gerrit/git/PushQueue.java
+++ b/src/main/java/com/google/gerrit/git/PushQueue.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/git/RepositoryCache.java b/src/main/java/com/google/gerrit/git/RepositoryCache.java
index 3e413aa8e2..324e6c429d 100644
--- a/src/main/java/com/google/gerrit/git/RepositoryCache.java
+++ b/src/main/java/com/google/gerrit/git/RepositoryCache.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/git/WorkQueue.java b/src/main/java/com/google/gerrit/git/WorkQueue.java
index a7f47e8088..95ad304a21 100644
--- a/src/main/java/com/google/gerrit/git/WorkQueue.java
+++ b/src/main/java/com/google/gerrit/git/WorkQueue.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/pgm/CreateSchema.java b/src/main/java/com/google/gerrit/pgm/CreateSchema.java
index 8a0958c2d5..05161e22ca 100644
--- a/src/main/java/com/google/gerrit/pgm/CreateSchema.java
+++ b/src/main/java/com/google/gerrit/pgm/CreateSchema.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/pgm/EncryptContactInfo.java b/src/main/java/com/google/gerrit/pgm/EncryptContactInfo.java
index ec1cb32fee..1a5e6fa06b 100644
--- a/src/main/java/com/google/gerrit/pgm/EncryptContactInfo.java
+++ b/src/main/java/com/google/gerrit/pgm/EncryptContactInfo.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java b/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java
index f035a1c816..a188805398 100644
--- a/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java
+++ b/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java b/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java
index b303293d39..a71e42683b 100644
--- a/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java
+++ b/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/pgm/Version.java b/src/main/java/com/google/gerrit/pgm/Version.java
index 0bac4d0788..f20c6cf664 100644
--- a/src/main/java/com/google/gerrit/pgm/Version.java
+++ b/src/main/java/com/google/gerrit/pgm/Version.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/AccountSecurityImpl.java b/src/main/java/com/google/gerrit/server/AccountSecurityImpl.java
index 7d3ef73bc6..df0eb8dd1b 100644
--- a/src/main/java/com/google/gerrit/server/AccountSecurityImpl.java
+++ b/src/main/java/com/google/gerrit/server/AccountSecurityImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/AccountSecuritySrv.java b/src/main/java/com/google/gerrit/server/AccountSecuritySrv.java
index 4ddf79a83a..fe6b2024ee 100644
--- a/src/main/java/com/google/gerrit/server/AccountSecuritySrv.java
+++ b/src/main/java/com/google/gerrit/server/AccountSecuritySrv.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/AccountServiceSrv.java b/src/main/java/com/google/gerrit/server/AccountServiceSrv.java
index f750a76263..9f298c72c7 100644
--- a/src/main/java/com/google/gerrit/server/AccountServiceSrv.java
+++ b/src/main/java/com/google/gerrit/server/AccountServiceSrv.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ChangeDetailServiceSrv.java b/src/main/java/com/google/gerrit/server/ChangeDetailServiceSrv.java
index b7680efa3c..fc3bae01c1 100644
--- a/src/main/java/com/google/gerrit/server/ChangeDetailServiceSrv.java
+++ b/src/main/java/com/google/gerrit/server/ChangeDetailServiceSrv.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ChangeListServiceSrv.java b/src/main/java/com/google/gerrit/server/ChangeListServiceSrv.java
index ff1cd0e038..910a772b3f 100644
--- a/src/main/java/com/google/gerrit/server/ChangeListServiceSrv.java
+++ b/src/main/java/com/google/gerrit/server/ChangeListServiceSrv.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ChangeMail.java b/src/main/java/com/google/gerrit/server/ChangeMail.java
index bb9f87155f..4c77fd9af5 100644
--- a/src/main/java/com/google/gerrit/server/ChangeMail.java
+++ b/src/main/java/com/google/gerrit/server/ChangeMail.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ChangeManageServiceImpl.java b/src/main/java/com/google/gerrit/server/ChangeManageServiceImpl.java
index a66238c0ba..9bab59c331 100644
--- a/src/main/java/com/google/gerrit/server/ChangeManageServiceImpl.java
+++ b/src/main/java/com/google/gerrit/server/ChangeManageServiceImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ChangeManageServiceSrv.java b/src/main/java/com/google/gerrit/server/ChangeManageServiceSrv.java
index d76e0e769a..8ef64283aa 100644
--- a/src/main/java/com/google/gerrit/server/ChangeManageServiceSrv.java
+++ b/src/main/java/com/google/gerrit/server/ChangeManageServiceSrv.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ChangeUtil.java b/src/main/java/com/google/gerrit/server/ChangeUtil.java
index 6c3d8811fd..fa5c3f8d61 100644
--- a/src/main/java/com/google/gerrit/server/ChangeUtil.java
+++ b/src/main/java/com/google/gerrit/server/ChangeUtil.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/EncryptedContactStore.java b/src/main/java/com/google/gerrit/server/EncryptedContactStore.java
index fb1aac2dec..eecc4b052f 100644
--- a/src/main/java/com/google/gerrit/server/EncryptedContactStore.java
+++ b/src/main/java/com/google/gerrit/server/EncryptedContactStore.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/GerritCall.java b/src/main/java/com/google/gerrit/server/GerritCall.java
index 04c60a4a69..f218d371bb 100644
--- a/src/main/java/com/google/gerrit/server/GerritCall.java
+++ b/src/main/java/com/google/gerrit/server/GerritCall.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/GerritJsonServlet.java b/src/main/java/com/google/gerrit/server/GerritJsonServlet.java
index 943d2f2525..db3f222143 100644
--- a/src/main/java/com/google/gerrit/server/GerritJsonServlet.java
+++ b/src/main/java/com/google/gerrit/server/GerritJsonServlet.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/GerritOpenIdUserManager.java b/src/main/java/com/google/gerrit/server/GerritOpenIdUserManager.java
index 55655f6121..1c72326054 100644
--- a/src/main/java/com/google/gerrit/server/GerritOpenIdUserManager.java
+++ b/src/main/java/com/google/gerrit/server/GerritOpenIdUserManager.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/GerritServer.java b/src/main/java/com/google/gerrit/server/GerritServer.java
index 8a055ea7cc..0542cd23c5 100644
--- a/src/main/java/com/google/gerrit/server/GerritServer.java
+++ b/src/main/java/com/google/gerrit/server/GerritServer.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/GroupAdminServiceImpl.java b/src/main/java/com/google/gerrit/server/GroupAdminServiceImpl.java
index 201cd9e942..bc5d2e3b0b 100644
--- a/src/main/java/com/google/gerrit/server/GroupAdminServiceImpl.java
+++ b/src/main/java/com/google/gerrit/server/GroupAdminServiceImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/GroupAdminServiceSrv.java b/src/main/java/com/google/gerrit/server/GroupAdminServiceSrv.java
index 36edbc933c..730d16808b 100644
--- a/src/main/java/com/google/gerrit/server/GroupAdminServiceSrv.java
+++ b/src/main/java/com/google/gerrit/server/GroupAdminServiceSrv.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/HostPageServlet.java b/src/main/java/com/google/gerrit/server/HostPageServlet.java
index 92114ce38b..2d08b30c2e 100644
--- a/src/main/java/com/google/gerrit/server/HostPageServlet.java
+++ b/src/main/java/com/google/gerrit/server/HostPageServlet.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/HtmlDomUtil.java b/src/main/java/com/google/gerrit/server/HtmlDomUtil.java
index e70a041d31..e74f66de00 100644
--- a/src/main/java/com/google/gerrit/server/HtmlDomUtil.java
+++ b/src/main/java/com/google/gerrit/server/HtmlDomUtil.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/OpenIdLoginServlet.java b/src/main/java/com/google/gerrit/server/OpenIdLoginServlet.java
index feb03e1f26..07a7314c69 100644
--- a/src/main/java/com/google/gerrit/server/OpenIdLoginServlet.java
+++ b/src/main/java/com/google/gerrit/server/OpenIdLoginServlet.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/PatchDetailServiceSrv.java b/src/main/java/com/google/gerrit/server/PatchDetailServiceSrv.java
index 3f08a0663c..0cb68c7180 100644
--- a/src/main/java/com/google/gerrit/server/PatchDetailServiceSrv.java
+++ b/src/main/java/com/google/gerrit/server/PatchDetailServiceSrv.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ProjectAdminServiceImpl.java b/src/main/java/com/google/gerrit/server/ProjectAdminServiceImpl.java
index c85625de60..475c16b594 100644
--- a/src/main/java/com/google/gerrit/server/ProjectAdminServiceImpl.java
+++ b/src/main/java/com/google/gerrit/server/ProjectAdminServiceImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ProjectAdminServiceSrv.java b/src/main/java/com/google/gerrit/server/ProjectAdminServiceSrv.java
index dc004651e3..f0a7d13cee 100644
--- a/src/main/java/com/google/gerrit/server/ProjectAdminServiceSrv.java
+++ b/src/main/java/com/google/gerrit/server/ProjectAdminServiceSrv.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/StaticServlet.java b/src/main/java/com/google/gerrit/server/StaticServlet.java
index c02417d521..402fbd395a 100644
--- a/src/main/java/com/google/gerrit/server/StaticServlet.java
+++ b/src/main/java/com/google/gerrit/server/StaticServlet.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/SuggestServiceSrv.java b/src/main/java/com/google/gerrit/server/SuggestServiceSrv.java
index 965585d28d..d9b3b0da50 100644
--- a/src/main/java/com/google/gerrit/server/SuggestServiceSrv.java
+++ b/src/main/java/com/google/gerrit/server/SuggestServiceSrv.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/SystemInfoServiceImpl.java b/src/main/java/com/google/gerrit/server/SystemInfoServiceImpl.java
index db8985ecd8..18daa86e39 100644
--- a/src/main/java/com/google/gerrit/server/SystemInfoServiceImpl.java
+++ b/src/main/java/com/google/gerrit/server/SystemInfoServiceImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/SystemInfoServiceSrv.java b/src/main/java/com/google/gerrit/server/SystemInfoServiceSrv.java
index 2d25cc8766..e78bdd5914 100644
--- a/src/main/java/com/google/gerrit/server/SystemInfoServiceSrv.java
+++ b/src/main/java/com/google/gerrit/server/SystemInfoServiceSrv.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/UrlRewriteFilter.java b/src/main/java/com/google/gerrit/server/UrlRewriteFilter.java
index b556e0a909..62480cf9e2 100644
--- a/src/main/java/com/google/gerrit/server/UrlRewriteFilter.java
+++ b/src/main/java/com/google/gerrit/server/UrlRewriteFilter.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/patch/PatchDetailAction.java b/src/main/java/com/google/gerrit/server/patch/PatchDetailAction.java
index 9c4155cece..6ea40973ed 100644
--- a/src/main/java/com/google/gerrit/server/patch/PatchDetailAction.java
+++ b/src/main/java/com/google/gerrit/server/patch/PatchDetailAction.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java b/src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java
index 3f33b3a53b..db835cef62 100644
--- a/src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java
+++ b/src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/patch/SideBySidePatchDetailAction.java b/src/main/java/com/google/gerrit/server/patch/SideBySidePatchDetailAction.java
index 2bf04e3e3b..2c921fd6ab 100644
--- a/src/main/java/com/google/gerrit/server/patch/SideBySidePatchDetailAction.java
+++ b/src/main/java/com/google/gerrit/server/patch/SideBySidePatchDetailAction.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/patch/UnifiedPatchDetailAction.java b/src/main/java/com/google/gerrit/server/patch/UnifiedPatchDetailAction.java
index 281a5f5163..3abc2f0b7a 100644
--- a/src/main/java/com/google/gerrit/server/patch/UnifiedPatchDetailAction.java
+++ b/src/main/java/com/google/gerrit/server/patch/UnifiedPatchDetailAction.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ssh/AbstractCommand.java b/src/main/java/com/google/gerrit/server/ssh/AbstractCommand.java
index 0448042563..c513386b21 100644
--- a/src/main/java/com/google/gerrit/server/ssh/AbstractCommand.java
+++ b/src/main/java/com/google/gerrit/server/ssh/AbstractCommand.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ssh/AbstractGitCommand.java b/src/main/java/com/google/gerrit/server/ssh/AbstractGitCommand.java
index 905293c970..0376809b9f 100644
--- a/src/main/java/com/google/gerrit/server/ssh/AbstractGitCommand.java
+++ b/src/main/java/com/google/gerrit/server/ssh/AbstractGitCommand.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ssh/AdminFlushCaches.java b/src/main/java/com/google/gerrit/server/ssh/AdminFlushCaches.java
index 0e759a2d7a..89dcf55b1a 100644
--- a/src/main/java/com/google/gerrit/server/ssh/AdminFlushCaches.java
+++ b/src/main/java/com/google/gerrit/server/ssh/AdminFlushCaches.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ssh/DatabasePubKeyAuth.java b/src/main/java/com/google/gerrit/server/ssh/DatabasePubKeyAuth.java
index 2f92edc3a1..fb987e99cf 100644
--- a/src/main/java/com/google/gerrit/server/ssh/DatabasePubKeyAuth.java
+++ b/src/main/java/com/google/gerrit/server/ssh/DatabasePubKeyAuth.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ssh/GerritCommandFactory.java b/src/main/java/com/google/gerrit/server/ssh/GerritCommandFactory.java
index 2c72c46c4b..06588a05dc 100644
--- a/src/main/java/com/google/gerrit/server/ssh/GerritCommandFactory.java
+++ b/src/main/java/com/google/gerrit/server/ssh/GerritCommandFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ssh/ListProjects.java b/src/main/java/com/google/gerrit/server/ssh/ListProjects.java
index 86591b95de..11acb9f018 100644
--- a/src/main/java/com/google/gerrit/server/ssh/ListProjects.java
+++ b/src/main/java/com/google/gerrit/server/ssh/ListProjects.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ssh/NoShell.java b/src/main/java/com/google/gerrit/server/ssh/NoShell.java
index 7f9b1a2a6f..f0cc986202 100644
--- a/src/main/java/com/google/gerrit/server/ssh/NoShell.java
+++ b/src/main/java/com/google/gerrit/server/ssh/NoShell.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ssh/Receive.java b/src/main/java/com/google/gerrit/server/ssh/Receive.java
index 132476f803..3f203e0fd7 100644
--- a/src/main/java/com/google/gerrit/server/ssh/Receive.java
+++ b/src/main/java/com/google/gerrit/server/ssh/Receive.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ssh/SshServlet.java b/src/main/java/com/google/gerrit/server/ssh/SshServlet.java
index 03ce4eb02b..1f67d662b7 100644
--- a/src/main/java/com/google/gerrit/server/ssh/SshServlet.java
+++ b/src/main/java/com/google/gerrit/server/ssh/SshServlet.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ssh/SshUtil.java b/src/main/java/com/google/gerrit/server/ssh/SshUtil.java
index 64e5c5b098..696aaa1e2b 100644
--- a/src/main/java/com/google/gerrit/server/ssh/SshUtil.java
+++ b/src/main/java/com/google/gerrit/server/ssh/SshUtil.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/gerrit/server/ssh/Upload.java b/src/main/java/com/google/gerrit/server/ssh/Upload.java
index aa2cf618c9..fa91061792 100644
--- a/src/main/java/com/google/gerrit/server/ssh/Upload.java
+++ b/src/main/java/com/google/gerrit/server/ssh/Upload.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.