Michael Wright 244f776855 resolve merge conflicts of f013c3f111 to master. ...

Change-Id: I2045187f8fa948a1733cb9a2cdc0a69ae97b5907

2015-10-20 23:48:55 +01:00

..

res

Import translations. DO NOT MERGE

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

src/com/android/settingslib

resolve merge conflicts of f013c3f111 to master.

2015-10-20 23:48:55 +01:00

tests

…

Android.mk

…

AndroidManifest.xml

Add uses-sdk to reduce red squigglies

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

common.mk

…