Dianne Hackborn 678d344bcb resolved conflicts for merge of b9e2f68b to master ...

Change-Id: Icb68aee4c68170f0e7cd7854dbaa61656a349142

2011-06-03 14:15:10 -07:00

..

src/com/android/internal/policy/impl

resolved conflicts for merge of b9e2f68b to master

2011-06-03 14:15:10 -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