am 12715c36: am 8e2eb583: Merge change I22cf0509 into eclair-mr2

Merge commit '12715c366c69b54b3e5218fd25647980a6502be0'

* commit '12715c366c69b54b3e5218fd25647980a6502be0':
  Add China data to MccTable.