Chung-yih Wang dbecc24a4e resolved conflicts for merge of a329aef4 to master ...

Change-Id: I5a64ee2b6adc56a7521d2e55a72e519a284d5a7c

2010-09-01 11:00:33 +08:00

..

config

…

java

resolved conflicts for merge of a329aef4 to master

2010-09-01 11:00:33 +08:00

jni

am ae087369: am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." into gingerbread

2010-08-31 15:06:24 -07:00

res

Add LocalePicker fragment as one of internal components.

2010-08-31 16:22:40 -07:00

tests

am 8a5ab396: am 2e86809b: Merge "Native libraries on SD" into gingerbread

2010-08-30 15:24:45 -07:00