Chung-yih Wang 024d59601e resolved conflicts for merge of a06ad953 to master ...

Change-Id: I282525787d7475cc72b2dec10fbc2cf8c5727b82

2010-08-06 12:06:04 +08:00

..

config

…

java

resolved conflicts for merge of a06ad953 to master

2010-08-06 12:06:04 +08:00

jni

Merge "Add support for paths."

2010-08-05 17:25:48 -07:00

res

Merge "Import revised translations."

2010-08-05 17:27:46 -07:00

tests

am 499b7438: Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread

2010-08-05 17:15:08 -07:00