Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/chromium into mr1-staging
Revert "net: networking optimizations"

This reverts commit 5fbe95affc8eeed93c678b1d271f64dcc4dd919b.
Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1
Merge remote-tracking branch 'cm/cm-10.2' into HEAD