OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 20:52:52 +0000 (13:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 20:52:52 +0000 (13:52 -0700)
commit55b7d1243f15395a102971e8fdc57444638729ac
tree1dfc4a8feb15fceb73562aa14c7f641336314b92
parent3d52305faa682366eb34c30892ddd2b390940048
parenta2adf8f394bd568b6108fe989b0ac0ca2072670d
merge from open-source master

Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
telephony/java/com/android/internal/telephony/PhoneBase.java