Jeff Brown 76a23f8b2e resolved conflicts for merge of eebc944f to master ...

Change-Id: I969cf69d2bd6901742d2cdf1bd44344ee7ba9fc7

2011-01-24 16:43:28 -08:00

..

src/com/android/internal/policy/impl

resolved conflicts for merge of eebc944f to master

2011-01-24 16:43:28 -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