Brad Fitzpatrick 37fc8cc7b8 am b724d251: Merge "Enable strictmode logging in system_server & add a lock." into gingerbread ...

Merge commit 'b724d2519a900744a477bd57df6a2f8703c87e72' into gingerbread-plus-aosp

* commit 'b724d2519a900744a477bd57df6a2f8703c87e72':
  Enable strictmode logging in system_server & add a lock.

2010-09-10 14:08:58 -07:00

..

com/android/server

am b724d251: Merge "Enable strictmode logging in system_server & add a lock." into gingerbread

2010-09-10 14:08:58 -07:00

Android.mk

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

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