tree c94c46f4d6fc2e8105c423b752ae756dfabe8b75
parent a4cf5cc9ecc3c5d2658943117f7d182b26c77b30
parent 0dd70276f6cfe09010054897a80d406ea9ac13de
author smain@google.com <smain@google.com> 1416328467 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416328467 +0000

am 0dd70276: am 6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603

* commit '0dd70276f6cfe09010054897a80d406ea9ac13de':
  followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603