am 3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper...
am 3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo
Merge commit '3f264c4f' into froyo-plus-aosp
* commit '3f264c4f':
API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council