Jim Miller 76b2337cfa resolved conflicts for merge of 1a783be3 to master ...

Change-Id: Ibaff3547ac51250fe40adf3aa06d6a30ecfcef54

2011-11-18 13:56:20 -08:00

..

src/com/android/internal/policy/impl

resolved conflicts for merge of 1a783be3 to master

2011-11-18 13:56:20 -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