Dianne Hackborn 27dec99148 resolved conflicts for merge of 4d28e8c5 to master ...

Change-Id: I2449488a84e44b3fb5f820b50951b2b2bfa3bcbf

2010-10-01 16:44:12 -07:00

..

src/com/android/internal/policy/impl

resolved conflicts for merge of 4d28e8c5 to master

2010-10-01 16:44:12 -07:00

tests

Move out all framework-tests classes.

2010-06-14 17:23:08 -07:00

Android.mk

Move out all framework-tests classes.

2010-06-14 17:23:08 -07:00