am 3ca26914: am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread

Merge commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc'

* commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc':
  Dedupe timestamp in PackageSettings