Kenny Root bff405f910 resolved conflicts for merge of d8e8186c to master ...

Change-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5

2010-09-28 18:16:50 -07:00

..

android_runtime

…

binder

…

camera

…

drm

…

gui

…

media

am d6c30e8c: am be045061: Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread

2010-09-28 14:01:14 -07:00

pim

…

private

…

storage

Update OBB API to include callbacks

2010-09-28 17:23:26 -07:00

surfaceflinger

…

tts

…

ui

Add support for transferring touch focus.

2010-09-27 16:10:17 -07:00

utils

…