tree ff13e05cb05303e9cc53a2b8f9d113760eab3763
parent ca5521ed66d3f403d893f087f794b9c595a69593
parent 2548ceb98a8c777ec354db18ed5f5e86558dabca
author Dirk Dougherty <ddougherty@google.com> 1380591913 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380591913 -0700

am 2548ceb9: am 8c423d72: Merge "Raise the default max-age for client side caching to 43200 (12hrs)." into jb-mr2-docs

* commit '2548ceb98a8c777ec354db18ed5f5e86558dabca':
  Raise the default max-age for client side caching to 43200 (12hrs).