Dianne Hackborn 9b081a809a resolved conflicts for merge of 8b625a95 to master ...

Change-Id: I03264c6aad2d87629f9154f5c390cb36ce08efba

2010-05-18 18:21:07 -07:00

..

com/android/internal/policy/impl

resolved conflicts for merge of 8b625a95 to master

2010-05-18 18:21:07 -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