Nick Pelly 089c3c7c0b resolved conflicts for merge of 28e8c66d to master ...

Change-Id: I9746fd7478d3954b491179ffbd241f481cc2fb6c

2010-12-06 11:50:47 -08:00

..

config

…

java

resolved conflicts for merge of 28e8c66d to master

2010-12-06 11:50:47 -08:00

jni

Ensure the ShortcutManager uses the correct key character map.

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

res

Fix bug 3245210 - Bad window style for action modes for light holo dialog theme

2010-12-05 18:29:10 -08:00

tests

Merge "add caching to the AccountManagerService"

2010-12-06 09:55:54 -08:00