Dianne Hackborn 917d88213e am fde7fdd3: am 50395e80: Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread ...

Merge commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c'

* commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c':
  Fix a fun bug with multiple service bindings from an activity.

2010-08-25 16:40:55 -07:00

..

com/android/server

am fde7fdd3: am 50395e80: Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread

2010-08-25 16:40:55 -07:00

Android.mk

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

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