Salvador Martinez 923534f641 resolve merge conflicts of 8ec7028 to master ...

Change-Id: I02767dea7e2fd8e6dfdfe495af1c28587b080630

2016-09-07 10:24:03 -07:00

..

res

…

src/com/android/settings

Fixed Sound Settings summary text

2016-09-06 17:23:50 -07:00

Android.mk

Fixed Sound Settings summary text

2016-09-06 17:23:50 -07:00

AndroidManifest.xml

…