Romain Guy 87ef4252ec resolved conflicts for merge of 176a88ff to master

2010-01-27 16:20:49 -08:00

..

config

…

java

resolved conflicts for merge of 176a88ff to master

2010-01-27 16:20:49 -08:00

jni

Merge "Add support for setting camera display orientation."

2010-01-27 09:20:19 -08:00

res

More work on device admins:

2010-01-27 13:51:53 -08:00

tests/coretests

Phase 2 of test file cleanup: relocating test files from FrameworkTest closer to their sources in core.

2010-01-27 14:15:55 -08:00