summaryrefslogtreecommitdiffstats
path: root/media/tests
diff options
context:
space:
mode:
authorHui Lu <huilu@google.com>2014-02-25 18:03:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-25 18:03:07 +0000
commitd22f23b2d6edec664263fa7f99101cfde555ff61 (patch)
tree6f472705cf4be81c70451583140fd5516f617feb /media/tests
parente794dd5c5217e53b14e55b76b0f01bd7d9979843 (diff)
parentfcf7d3a64947a8a0f05ee9e0669abe4a0727f926 (diff)
downloadframeworks_base-d22f23b2d6edec664263fa7f99101cfde555ff61.zip
frameworks_base-d22f23b2d6edec664263fa7f99101cfde555ff61.tar.gz
frameworks_base-d22f23b2d6edec664263fa7f99101cfde555ff61.tar.bz2
am fcf7d3a6: am eeb291b7: am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev
* commit 'fcf7d3a64947a8a0f05ee9e0669abe4a0727f926': Reconnect/teardown proxy network connectivity.
Diffstat (limited to 'media/tests')
0 files changed, 0 insertions, 0 deletions