Wink Saville 2900a3fae6 Fix build. ...

I tried to get these into the merge conflict resolution,
but didn't succeed.

Change-Id: Id474415869182da438c09f7a75ee54c098fbc81e

2012-08-13 16:50:30 -07:00

..

android/telephony

Fix build.

2012-08-13 16:50:30 -07:00

com/android/internal/telephony

am eb2257cc: am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard"

2012-08-08 17:44:24 -07:00