Dianne Hackborn ccc7141313 resolved conflicts for merge of 78e9f4cb to master ...

Change-Id: I1135361e6d66f524c3f349e2bf1f31bd4191c634

2010-12-13 14:55:25 -08:00

..

src/com/android/internal/policy/impl

resolved conflicts for merge of 78e9f4cb to master

2010-12-13 14:55:25 -08: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