Justin Ho 276966e7ad Merge "Updated quickcontact badges Bug: 5076695"

2011-08-08 13:21:31 -07:00

..

java

Merge "Don't perform query if QuickContactBadge has been initialized via assignContactUri"

2011-08-08 13:06:01 -07:00

jni

Merge "Revert "Adapt TextLayoutCache for new Harfbuzz scripts""

2011-08-08 12:56:05 -07:00

res

Merge "Updated quickcontact badges Bug: 5076695"

2011-08-08 13:21:31 -07:00

tests

Merge "Bandwidth microbenchmark test app for ICS."

2011-08-04 18:34:53 -07:00