Michael Wright bab2b42445 resolve merge conflicts of 57a5cba606 to cw-e-dev. ...

Change-Id: Ib43f0cf0b285c9799239658859af735279f87fff

2015-10-20 17:06:27 +01:00

..

res

Import translations. DO NOT MERGE

2015-09-24 19:36:51 -07:00

src/com/android/settingslib

resolve merge conflicts of 57a5cba606 to cw-e-dev.

2015-10-20 17:06:27 +01:00

tests

…

Android.mk

…

AndroidManifest.xml

Add uses-sdk to reduce red squigglies

2015-06-08 15:46:51 -07:00

common.mk

…