Dianne Hackborn 65efcc5521 Merge "resolved conflicts for merge of 77fc8b80 to master"

2011-06-14 15:05:46 -07:00

..

java

Merge "resolved conflicts for merge of 77fc8b80 to master"

2011-06-14 15:05:46 -07:00

jni

Merge "Support for setting a ParcelSurfaceTexture as the MediaPlayer sink."

2011-06-14 11:18:30 -07:00

res

am aabe5f46: am 49572479: Update sim missing message in lock screen.

2011-06-14 10:17:51 -07:00

tests

Rename Calendar.java to CalendarContract.java

2011-06-14 11:39:35 -07:00