tree 0c386e933e3ac3aa3c1a5690bb245d5662c458ef
parent 7606f86f9326fd78a95bdd94e55c6f8b5174a88b
parent 8774da6f41bcd31d6e4bfa1def5cf701c0c11a1f
author Amit Pundir <amit.pundir@linaro.org> 1378928686 +0530
committer Amit Pundir <amit.pundir@linaro.org> 1378928686 +0530

Merge branch 'linaro_android_4.3' of git://android.git.linaro.org/platform/packages/apps/Settings into linaro_android_4.3