tree 1ce92ace07e2925f35f75f89775c4c29246f153e
parent 5134d711d1ff0f0d0ba2df10d22742fb769835e0
parent 6c50da75f696c184590c6e27d25755ee428f2afc
author Jean-Baptiste Queru <jbq@google.com> 1339438935 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339438935 -0700

am 6c50da75: am 7d77977f: Merge "Fix Force Close when enable airplane mode"

* commit '6c50da75f696c184590c6e27d25755ee428f2afc':
  Fix Force Close when enable airplane mode