Svetoslav Ganov ca34bcf674 resolved conflicts for merge of 80c904df to jb-mr1-dev ...

Change-Id: Ic2f8d64cd716d04a533ca0685d1fb0d5e2a21933

2012-08-16 12:22:23 -07:00

..

res

…

src/com/android/providers/settings

…

Android.mk

…

AndroidManifest.xml

…

MODULE_LICENSE_APACHE2

…

NOTICE

…