Doris Ling 388a138fd6 Merge "Update summary text for Trust agent." into oc-dev am: b9a54bae08 ...

am: 4e33cc1279

Change-Id: I71cebb56677c1cc9f502c1578f2de3fbcfa88f26

2017-04-07 02:21:17 +00:00

..

app

Merge "Fix crash when clicking item in Battery screen" into oc-dev am: bac9b527e7

2017-04-06 23:03:55 +00:00

robotests

Merge "Update summary text for Trust agent." into oc-dev am: b9a54bae08

2017-04-07 02:21:17 +00:00

unit

Merge "Change test type from InstrumentationTest to AndroidJUnitTest"

2017-04-01 04:49:19 +00:00

Android.mk

Change build targets for settings tests

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