tree 574c928f9c886b55cfb61d28178f20f293f1a5a2
parent ebc9c692f2fdc053e5be82407bc6755cb1153e3b
parent 14dc0e7f785fc169195ed304687925e22bb706b7
author Dirk Dougherty <ddougherty@google.com> 1380592089 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380592089 -0700

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

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