From: jsh <jsh@google.com>
Date: Mon, 28 Sep 2009 17:31:14 +0000 (-0700)
Subject: am 57b49b70: am afa9d6ea: Merge change 27283 into eclair
X-Git-Tag: android-x86-2.2~388
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=925efec53d979dc664f4bba2822c534990abaa0b;p=android-x86%2Fpackages-apps-Settings.git

am 57b49b70: am afa9d6ea: Merge change 27283 into eclair

Merge commit '57b49b70de0ec6ea7528b44c0b82594c804996b7'

* commit '57b49b70de0ec6ea7528b44c0b82594c804996b7':
  Display cell location for CDMA in Phone info screen.
---

925efec53d979dc664f4bba2822c534990abaa0b