Android (Google) Code Review a4170099b1 Merge change 7587 ...

* changes:
  Fixes merge conflict.

2009-07-16 15:17:55 -07:00

..

config

Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE

2009-05-01 17:47:08 -07:00

java

Merge change 7587

2009-07-16 15:17:55 -07:00

jni

Rename registerPhoneStateChange to registerPreciseCallStateChange

2009-07-14 21:29:41 -07:00

res

am a2694c99: Merge change 7166 into donut

2009-07-14 16:27:25 -07:00