summaryrefslogtreecommitdiff
path: root/samples/browseable/BasicMediaDecoder/src/com.example.android.basicmediadecoder/MainActivity.java
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-09-30 18:45:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-30 18:45:13 -0700
commit14dc0e7f785fc169195ed304687925e22bb706b7 (patch)
treeff13e05cb05303e9cc53a2b8f9d113760eab3763 /samples/browseable/BasicMediaDecoder/src/com.example.android.basicmediadecoder/MainActivity.java
parentca5521ed66d3f403d893f087f794b9c595a69593 (diff)
parent2548ceb98a8c777ec354db18ed5f5e86558dabca (diff)
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).
Diffstat (limited to 'samples/browseable/BasicMediaDecoder/src/com.example.android.basicmediadecoder/MainActivity.java')
0 files changed, 0 insertions, 0 deletions