David Brown e3df791ff2 am a0a58235: am 01719a22: Merge "Placeholder icons for the "ringing" variant of stat_sys_phone_call." into gingerbread ...

Merge commit 'a0a582355ba10454d2625ce2968015e50a12a3e3'

* commit 'a0a582355ba10454d2625ce2968015e50a12a3e3':
  Placeholder icons for the "ringing" variant of stat_sys_phone_call.

2010-06-25 16:07:05 -07:00

..

config

…

java

am 8b0d5bc3: merge from froyo-plus-aosp

2010-06-25 14:22:25 -07:00

jni

Convert tabs to spaces.

2010-06-25 13:46:18 -07:00

res

am a0a58235: am 01719a22: Merge "Placeholder icons for the "ringing" variant of stat_sys_phone_call." into gingerbread

2010-06-25 16:07:05 -07:00

tests

fix broken test similar to I32c30f7d05e5bec7c6b2776ce9a80c8be61d856f

2010-06-17 16:54:56 -07:00