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

Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp

* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
  Properly note the current active restore set's token

2010-06-24 16:04:07 -07:00

..

com/android/server

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

2010-06-24 16:04:07 -07:00

Android.mk

disable emma instrumentation for framework, ext and services (DO NOT MERGE)

2010-05-18 16:02:28 -07:00