Antony Sargent 0fe460a8e3 Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev ...

am: 49cd8f2327

Change-Id: I02c6056ab8efb238cb8ba97ea4d4ea6de247c13d

2017-08-10 07:25:52 +00:00

..

app

Import translations. DO NOT MERGE

2017-08-01 11:15:13 -07:00

robotests

Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev

2017-08-10 07:23:29 +00:00

unit

Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev

2017-07-26 10:53:30 +00:00

Android.mk

Change build targets for settings tests

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