Dianne Hackborn 14694eb9ae am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo ...

Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into froyo-plus-aosp

* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
  Properly note the current active restore set's token

2010-06-24 16:02:03 -07:00

..

java

am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo

2010-06-24 16:02:03 -07:00

jni

Fix alarms with negative or very large wakup times.

2010-03-31 15:38:08 -07:00

tests/servicestests

Limit DropBox storage to 1000 files (by default).

2010-03-24 17:48:20 -07:00