Ben Murdoch 45991bc13f resolved conflicts for merge of d2607118 to master ...

Change-Id: Id6092a762af775e9b5db390feaba3e10bd98ef7c

2010-12-01 10:55:18 +00:00

..

config

…

java

resolved conflicts for merge of d2607118 to master

2010-12-01 10:55:18 +00:00

jni

Ensure the ShortcutManager uses the correct key character map.

2010-11-30 18:50:17 -08:00

res

Preference changes to layouts.

2010-11-30 13:57:58 -08:00

tests

am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread

2010-11-24 13:29:56 -08:00