Fan Zhang 8b422ba448 Merge "Remove summary template in sleep timeout setting." into oc-dev am: 014ff46fa6 ...

am: f7ba1e7209

Change-Id: I867a5237475be372bcc183b038c9539a3c4a8087

2017-05-08 19:14:59 +00:00

..

app

Import translations. DO NOT MERGE

2017-04-28 19:46:17 -07:00

robotests

Merge "Remove summary template in sleep timeout setting." into oc-dev am: 014ff46fa6

2017-05-08 19:14:59 +00:00

unit

Merge "Fix a bug where override filter was always on." into oc-dev am: 408fd90102

2017-05-04 17:38:31 +00:00

Android.mk

Change build targets for settings tests

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