Fan Zhang f7ba1e7209 Merge "Remove summary template in sleep timeout setting." into oc-dev ...

am: 014ff46fa6

Change-Id: I9f9e924be57552eebfe5d8bff5463182463f6845

2017-05-08 19:08:20 +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

2017-05-08 18:57:57 +00:00

unit

Fix a bug where override filter was always on.

2017-05-03 17:31:21 -07:00

Android.mk

…