Jean-Baptiste Queru 2cc595af65 Revert "resolve conflicts" ...

This reverts commit 84f992a249491b9f755e879bf096baac3f9472f5.

2010-09-08 11:01:40 -07:00

..

config

…

java

am 468394fc: Text Selection: smart word detection. DO NOT MERGE.

2010-09-08 10:32:42 -07:00

jni

am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread

2010-09-08 10:32:38 -07:00

res

am 1f6a21c2: Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread

2010-09-07 14:46:08 -07:00

tests

Revert "resolve conflicts"

2010-09-08 11:01:40 -07:00