Christopher Tate 8f4e49a8fe Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0

2011-10-14 10:33:13 -07:00

..

com/android/server

Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0

2011-10-14 10:33:13 -07:00

Android.mk

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

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