Jeff Brown 8e03b7566c resolved conflicts for merge of 9e660c82 to master ...

Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43

2010-06-13 19:16:55 -07:00

..

com/android/internal/policy/impl

resolved conflicts for merge of 9e660c82 to master

2010-06-13 19:16:55 -07:00

Android.mk

Finish moving the policies out of frameworks/policies/base and into frameworks/base.

2010-04-06 20:21:30 -05:00