Joe Onorato 8a5f10b30d resolved conflicts for merge of f7b79151 to master ...

Change-Id: Ia4538f73d8bade9e6565835d484dcb650830feca

2010-06-09 15:07:16 -07:00

..

com/android/internal/policy/impl

resolved conflicts for merge of f7b79151 to master

2010-06-09 15:07:16 -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