tree 94e45b54840c760445ea07e8f611d0a46f450aba
parent d529162544b5fb8ff0d5da99280424910e603e14
author guoweis@webrtc.org <guoweis@webrtc.org> 1410270885 +0000
committer guoweis@webrtc.org <guoweis@webrtc.org> 1410270885 +0000

fix a bug in the logic when new Networks are merged. This happens when
we have 2 networks with the same key

BUG=410554 in chromium

http://code.google.com/p/chromium/issues/detail?id=410554

Corresponding change in chromium is
https://codereview.chromium.org/536133003/

R=jiayl@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/19249005

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7117 4adac7df-926f-26a2-2b94-8c16560cd09d