Antony Sargent d9456d807b Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327 ...

am: 0fe460a8e3

Change-Id: I000eba2d8266b3d86f08c336f4ae3217ae48b8ac

2017-08-10 07:28:51 +00:00

..

app

Merge "Misc fixes for settings" into oc-mr1-dev

2017-08-09 18:03:29 +00:00

robotests

Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327

2017-08-10 07:28:51 +00:00

unit

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

2017-07-26 16:18:50 +00:00

Android.mk

…