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

* commit '719e1e43173155cbe0d77298c3d1ca05f143048b':
  DO NOT MERGE Put additional update package names in config.xml