Daniel Nishi 9ef9bfb6e9 Merge "Don't show warning dialog on opening ASM settings." into oc-dev am: 81f98a8fd5 ...

am: c7734f589e

Change-Id: Idc4760b31fa82f2e5387225f3da7c621a8decf4c

2017-04-20 18:53:59 +00:00

..

app

Merge "Use buttons for EncryptionInterstitial" into oc-dev

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

robotests

Merge "Don't show warning dialog on opening ASM settings." into oc-dev am: 81f98a8fd5

2017-04-20 18:53:59 +00:00

unit

Merge "Add test to verify regulatory info launches properly" into oc-dev am: 4766183336

2017-04-19 01:54:40 +00:00

Android.mk

Change build targets for settings tests

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