summaryrefslogtreecommitdiffstats
path: root/tests/MusicBrowserDemo/res/values
diff options
context:
space:
mode:
authorErik Kline <ek@google.com>2015-06-18 06:25:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-18 06:25:09 +0000
commit3d54e672a58301ff60498fc7c57870d9bccd0e45 (patch)
tree63362b615eb02944fb0481de04343a9a2054b68f /tests/MusicBrowserDemo/res/values
parent0ff78e7cc8f846517d8fd3cefa0c9b88cd94908d (diff)
parent4136850b80865141e554b61068c51f1d525b2600 (diff)
downloadframeworks_base-3d54e672a58301ff60498fc7c57870d9bccd0e45.zip
frameworks_base-3d54e672a58301ff60498fc7c57870d9bccd0e45.tar.gz
frameworks_base-3d54e672a58301ff60498fc7c57870d9bccd0e45.tar.bz2
Merge "Carefully select which DNS servers to send to netd" into mnc-dev
Diffstat (limited to 'tests/MusicBrowserDemo/res/values')
0 files changed, 0 insertions, 0 deletions