tree 359a25693dfbed11938a2ec4f69781688b4def05
parent 767d9fbd10b77f12385d12c748b06765ccddaeac
parent 4f397f0b0fad2bcdb9dcd577780471059bfb723d
author smain@google.com <smain@google.com> 1416342065 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416342065 +0000

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

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