Dianne Hackborn aa9d84c37e resolved conflicts for merge of 05be6d6f to master ...

Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212

2011-05-09 19:00:59 -07:00

..

src/com/android/internal/policy/impl

resolved conflicts for merge of 05be6d6f to master

2011-05-09 19:00:59 -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