From: Robert Greenwalt <rgreenwalt@google.com>
Date: Thu, 15 Aug 2013 14:17:11 +0000 (-0700)
Subject: am 1faefa06: Merge "Fix one NPE in tethering setting"
X-Git-Tag: android-x86-6.0-r1~671^2~1046^2~34
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a1fa7cef5d88d0f515efa07d0f7274c41fa6d712;p=android-x86%2Fpackages-apps-Settings.git

am 1faefa06: Merge "Fix one NPE in tethering setting"

* commit '1faefa06a3a742123af8ea5be5bbfb730db16c7c':
  Fix one NPE in tethering setting
---

a1fa7cef5d88d0f515efa07d0f7274c41fa6d712