Jack He 6ad51a2d10 Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev am: fdd8d3f6ae ...

am: a16bcf17d4

Change-Id: I7e8341383751e04f12f163bbe56eb90376ef491b

2017-04-27 00:40:57 +00:00

..

app

Merge "Import translations. DO NOT MERGE"

2017-04-26 19:40:34 +00:00

robotests

Merge "Bluetooth: Dismiss pairing dialog on user click" into oc-dev am: fdd8d3f6ae

2017-04-27 00:40:57 +00:00

unit

Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev am: 9797a39ad7

2017-04-26 18:54:10 +00:00

Android.mk

Change build targets for settings tests

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