Vasu Nori bbc2b4e69a am 5b31498b: add video/audio chat-compatibility modes to ContactsContract ...

Merge commit '5b31498ba1f9874f395d80152304512fa4c0144d' into gingerbread-plus-aosp

* commit '5b31498ba1f9874f395d80152304512fa4c0144d':
  add video/audio chat-compatibility modes to ContactsContract

2010-07-17 18:25:20 -07:00

..

config

…

java

am 5b31498b: add video/audio chat-compatibility modes to ContactsContract

2010-07-17 18:25:20 -07:00

jni

am ace999b0: Ignore attempts to finish events on unregistered channels.

2010-07-16 16:03:07 -07:00

res

Fix 2797185: Re-enable thumbnail generation in framework

2010-07-13 18:35:14 -07:00

tests

am b6761e73: am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo

2010-07-16 15:18:03 -07:00