summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2015-01-13 20:21:37 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-13 20:21:37 +0000
commitbd151d08428d6118422fb3412ca78cb656829d22 (patch)
tree57322a144e74a765ca44f9bcfa4b0a29c8fe6adf /docs
parentbe37df395eb791d9f877f4ca3c6e5d355a19896e (diff)
parent60b268f039857211333e2ea1cc68e795a12d7e07 (diff)
downloadframeworks_base-bd151d08428d6118422fb3412ca78cb656829d22.zip
frameworks_base-bd151d08428d6118422fb3412ca78cb656829d22.tar.gz
frameworks_base-bd151d08428d6118422fb3412ca78cb656829d22.tar.bz2
am f5f345cf: am 837261cc: Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade."
automerge: 60b268f * commit '60b268f039857211333e2ea1cc68e795a12d7e07': Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade.
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions