am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put additional update...
am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread
* commit '2ca7add5':
DO NOT MERGE Put additional update package names in config.xml