jackqdyulei 972763ee50 Merge "Show wifi and bluetooth item in battery settings" into oc-dev ...

am: 21d2403c67

Change-Id: I7ee542befa8e5287dbd73be242ec812a1a5d0c19

2017-05-18 19:26:20 +00:00

..

app

Import translations. DO NOT MERGE

2017-04-28 19:46:17 -07:00

robotests

Merge "Show wifi and bluetooth item in battery settings" into oc-dev

2017-05-18 19:13:35 +00:00

unit

Added WifiSettings Espresso tests.

2017-05-08 14:48:01 -07:00

Android.mk

Change build targets for settings tests

2016-01-21 12:32:15 +00:00