Gloria Wang cbb053c3c9 resolved conflicts for merge of 965f960e to master ...

Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338

2010-10-25 16:56:49 -07:00

..

android_runtime

am 86f1b643: am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread

2010-10-21 20:27:15 -07:00

binder

…

camera

Mirror the camera preview if the camera is front-facing.

2010-10-25 15:02:44 +08:00

drm

…

gui

…

media

resolved conflicts for merge of 965f960e to master

2010-10-25 16:56:49 -07:00

pim

…

private

…

storage

…

surfaceflinger

am 7e9a54d4: am d4e03f37: addresses parts of 3096779 and 3097475

2010-10-16 08:52:30 -07:00

tts

…

ui

am 2ef36763: am 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread

2010-10-24 14:36:23 -07:00

utils

Revert "Add length-equality test in String operator== checks."

2010-10-20 17:06:28 -07:00