tree affbc60bff70d21872ae34a6dbb7830127df08d6
parent 5dfe236081fd710d1bfe5f2d38002c4154168141
author Primiano Tucci <primiano@google.com> 1412766168 +0100
committer Primiano Tucci <primiano@google.com> 1412767212 +0100

Fix the "Fix broken merge of "handle bssid blacklist in case of dhcp failures""

The change Iad35fb8dc2ce14874ef7424c4be5648ca7ac916c (Fix broken merge of ...)
seem be a partial resolution of Iba13db478ed69976c37bd4882f59bf0cae2212e6: the
parcel ser/des lines are missing.
This is causing today a merge conflict (lmp-dev -> master) on a dependent
change (I89b4f5c05a1f64f9d1e8c407f62036efa0265043), which is confused by
the lack of the parcel ser/des lines.
I think this was a genuine mistakes. Readding these lines should make
the conflict go away and fix master.

Change-Id: I8499b9caeb1667f95727fdd18f318c5859a2321e