Lei Yu 7dc19949a4 Merge "Add device name for connect string" into oc-dev am: bcaabec925 ...

am: 96cba04e0d

Change-Id: I4de396b85b039ea3e9e64040287b21d89cad173d

2017-04-24 22:55:09 +00:00

..

app

Merge "Use buttons for EncryptionInterstitial" into oc-dev

2017-04-18 00:32:55 +00:00

robotests

Merge "Add device name for connect string" into oc-dev am: bcaabec925

2017-04-24 22:55:09 +00:00

unit

Merge "Gracefully handle null volumes after forgetting." into oc-dev am: d6d6185167

2017-04-20 18:54:28 +00:00

Android.mk

Change build targets for settings tests

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