Antony Sargent 92661526d4 Merge "Set advanced battery usage items as non-selectable" into oc-dev ...

am: d77b699e60

Change-Id: I2f7f524ee29224ee02a881c368bc058e55e98fec

2017-06-09 15:49:11 +00:00

..

app

Merge "Search results always highlight proper results" into oc-dev

2017-06-09 01:23:39 +00:00

robotests

Merge "Set advanced battery usage items as non-selectable" into oc-dev

2017-06-09 15:41:27 +00:00

unit

Consistent "low storage" behavior.

2017-05-30 23:51:06 -06:00

Android.mk

Change build targets for settings tests

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