Jean-Baptiste Queru 5c3816f2ff Merge c41aefe1 ...

Change-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b

2011-05-19 07:54:53 -07:00

..

com/android/server

Merge c41aefe1

2011-05-19 07:54:53 -07:00

Android.mk

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

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