Dianne Hackborn 3fe9cc5ea6 resolved conflicts for merge of e95c07bd to master ...

Change-Id: I9af0c08a9f1c1f68661efe051a66835e850b76f6

2011-06-14 16:13:26 -07:00

..

src/com/android/internal/policy/impl

resolved conflicts for merge of e95c07bd to master

2011-06-14 16:13:26 -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