Jim Miller 91fd9a9772 Merge "Fix 3197205: Minor edits to device policy admin strings and documentation"

2011-02-16 17:49:17 -08:00

..

com/android/server

Merge "Fix 3197205: Minor edits to device policy admin strings and documentation"

2011-02-16 17:49:17 -08:00

Android.mk

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

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