Antony Sargent d1dcfd1dc0 resolve merge conflicts of 1e74fdb6842b to oc-mr1-dev ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I1e90e7ff397f7a995c9d6471c876be020e6de582
Merged-In: I92b56b7908e5be8a3553a2779646d48bb5b94f01

2017-07-26 12:55:04 -07:00

..

res

Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev

2017-07-25 00:05:50 +00:00

src/com/android/settingslib

resolve merge conflicts of 1e74fdb6842b to oc-mr1-dev

2017-07-26 12:55:04 -07:00

tests

Merge "Sort APs by Speed label value instead of ranking score." into oc-mr1-dev

2017-07-26 03:41:27 +00:00

Android.mk

Create Espresso test for WifiSettings.

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

AndroidManifest.xml

…

common.mk

Add missing resource when building in AAPT1

2017-07-07 21:23:16 -07:00