Merge commit 'a9c6618' into merge
authorDavid Brown <dab@google.com>
Tue, 5 May 2009 22:58:54 +0000 (15:58 -0700)
committerDavid Brown <dab@google.com>
Tue, 5 May 2009 22:58:54 +0000 (15:58 -0700)
commitc5f3a741da47b4ef0a06df094512128d25e1ea20
tree7b005a5de287dd8aca50bf159d17635d8ca0e790
parent70ef77dbdafcab3cd0fc0dd9b15351a7640f6f97
parenta9c6618949b130cbd38c0c49b8b2d6cfb5e02a8e
Merge commit 'a9c6618' into merge

Conflicts:
res/values/config.xml

Manually fix merge conflict in res/values/config.xml
(from import of perforce CL 148291).
res/layout/sim_ndp.xml
res/values/config.xml
src/com/android/phone/IccNetworkDepersonalizationPanel.java