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