From: Robin Lee <rgl@google.com>
Date: Fri, 19 Jun 2015 21:23:00 +0000 (+0000)
Subject: am 02a0cf3a: am 3a839be7: Merge "Only unregister the network callback at onPause... 
X-Git-Tag: android-x86-7.1-r1~1235^2~522
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=645c4e327cda52b5dbc9560aece66edb075d7658;p=android-x86%2Fpackages-apps-Settings.git

am 02a0cf3a: am 3a839be7: Merge "Only unregister the network callback at onPause" into mnc-dev

* commit '02a0cf3ae32a272eff23364f8202f6086fabd28e':
  Only unregister the network callback at onPause
---

645c4e327cda52b5dbc9560aece66edb075d7658