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:48:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-30 18:48:09 -0700
commit392ca8fcd45a8d57d1f54ca5d81404143ee4eb48 (patch)
tree574c928f9c886b55cfb61d28178f20f293f1a5a2 /samples/browseable/BasicMediaDecoder/src/com.example.android.basicmediadecoder/MainActivity.java
parentebc9c692f2fdc053e5be82407bc6755cb1153e3b (diff)
parent14dc0e7f785fc169195ed304687925e22bb706b7 (diff)
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).
Diffstat (limited to 'samples/browseable/BasicMediaDecoder/src/com.example.android.basicmediadecoder/MainActivity.java')
0 files changed, 0 insertions, 0 deletions