tree 36f6a53dc522867d8adbd845453e44b9d535ad81
parent b41c951fb1b2a27d3278948f809e90a7c203ca4b
parent 2e76f5d8a282f4f948f88208e77dc4b3d0ec6634
author Vinit Deshapnde <vinitd@google.com> 1394565542 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394565542 +0000

am 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev

* commit '2e76f5d8a282f4f948f88208e77dc4b3d0ec6634':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi