ParanoidAndroid/android_frameworks_base — pull request #16 by adgad (2013-05-19 14:08:33+00:00)
Title: fix merge issues in config xml

Change-Id: Ia776504156cb7817f983833e34d4b81cc7399e85