Christian Sonntag 7e60acdac2 am 144c8eb7: am e54ebd8c: Merge change I647ae75e into eclair-mr2 ...

Merge commit '144c8eb7abbfcfdc7ffcc8caa57472b9b7dbda62'

* commit '144c8eb7abbfcfdc7ffcc8caa57472b9b7dbda62':
  Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps.

2009-10-14 18:16:34 -07:00

..

config

…

java

am 144c8eb7: am e54ebd8c: Merge change I647ae75e into eclair-mr2

2009-10-14 18:16:34 -07:00

jni

am aeed585d: am 43f2b4e9: am 53f33d84: Revert "Remove STOPSHIP comment."

2009-10-14 15:51:13 -07:00

res

am 4a7ab6c2: am c4989b1b: update the authtoken permission granting UI

2009-10-14 15:51:26 -07:00