Jason Simmons f981686779 resolved conflicts for merge of 3af8b88d to ics-aah ...

Change-Id: I2b68cd7c904e68a16565b7274560e7105c643c87

2011-11-09 10:08:21 -08:00

..

java

resolved conflicts for merge of 3af8b88d to ics-aah

2011-11-09 10:08:21 -08:00

jni

am 07b4b314: am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"

2011-11-02 02:20:19 +00:00

res

am 650a3e88: Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1

2011-11-09 14:37:17 +00:00

tests

Correct proc file reader, optimizations.

2011-11-02 15:14:11 -07:00