Sunny Goyal 91f6cad742 Merge "Using a common class for loading drawables and handling various badging" into oc-dev am: d2561263a8 ...

am: 77fca989a0

Change-Id: I402e3924400d60c56ee2af2f78b365c5090cccf2

2017-04-19 03:03:50 +00:00

..

app

Merge "Use buttons for EncryptionInterstitial" into oc-dev

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

robotests

Merge "Using a common class for loading drawables and handling various badging" into oc-dev am: d2561263a8

2017-04-19 03:03:50 +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