Daniel Nishi d587b00830 Merge "Upstream getApplicationLabel()." into oc-dr1-dev ...

am: 7049137d7f

Change-Id: I48e3995679750566d551edc3f63fa98a55bbc75d

2017-06-26 17:04:03 +00:00

..

res

Import translations. DO NOT MERGE

2017-06-23 00:39:00 -07:00

src/com/android/settingslib

Merge "Upstream getApplicationLabel()." into oc-dr1-dev

2017-06-26 16:58:18 +00:00

tests

Merge changes from topic 'wrong_password' into oc-dr1-dev

2017-06-23 18:19:05 +00:00

Android.mk

Create Espresso test for WifiSettings.

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

AndroidManifest.xml

…

common.mk

Add missing transitive dependencies

2017-02-16 17:34:29 -08:00