Benoit Lamarche 309335e727 resolve merge conflicts of 57fb5872d19c to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icc3fa0cd65fd6cd952008bdd068d527e20c81ae8

2017-04-14 15:59:04 +02:00

..

res

Import translations. DO NOT MERGE

2017-04-13 04:43:14 -07:00

src/com/android/settingslib

resolve merge conflicts of 57fb5872d19c to master

2017-04-14 15:59:04 +02:00

tests

resolve merge conflicts of 57fb5872d19c to master

2017-04-14 15:59:04 +02:00

Android.mk

Create Espresso test for WifiSettings.

2017-03-31 13:03:33 -07:00

AndroidManifest.xml

…

common.mk

…