summaryrefslogtreecommitdiffstats
path: root/preloaded-classes
diff options
context:
space:
mode:
authorvandwalle <vandwalle@google.com>2015-01-29 05:00:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-29 05:00:44 +0000
commit7e553a06a0506529563c6a0920e0de2a0d48cedc (patch)
tree65545d30113dc5e9d99ebe5eea615ac1ecd96443 /preloaded-classes
parentcf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b (diff)
parent0a22d43c9143475c889ce54f0de6261e8857ab9d (diff)
downloadframeworks_base-7e553a06a0506529563c6a0920e0de2a0d48cedc.zip
frameworks_base-7e553a06a0506529563c6a0920e0de2a0d48cedc.tar.gz
frameworks_base-7e553a06a0506529563c6a0920e0de2a0d48cedc.tar.bz2
Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge: d169839
automerge: 0a22d43 * commit '0a22d43c9143475c889ce54f0de6261e8857ab9d': aggressively blacklist WifiConfiguration for the purpose of switching network
Diffstat (limited to 'preloaded-classes')
0 files changed, 0 insertions, 0 deletions