tree 9f2318e6a01322e2ad93f3bbab82a5498d42e5ec
parent 6c52fdb684740a7ee86a743cacc701d9db24e8da
parent 9c118c80fd0a5416051f2a49f515301f2cf3fd6f
author johnwang <johnwang@google.com> 1253911482 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253911482 -0700

am 9c118c80: Update CID in NeighboringCellInfo

Merge commit '9c118c80fd0a5416051f2a49f515301f2cf3fd6f' into eclair-plus-aosp

* commit '9c118c80fd0a5416051f2a49f515301f2cf3fd6f':
  Update CID in NeighboringCellInfo