Doris Ling 3248492fd7 Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev am: 024bc8706d ...

am: 387b8c0f8e

Change-Id: I6f38e2100fbbfa30df6e3719cb66062573e54556

2017-04-27 03:31:07 +00:00

..

app

Merge "Import translations. DO NOT MERGE"

2017-04-26 19:40:34 +00:00

robotests

Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev am: 024bc8706d

2017-04-27 03:31:07 +00:00

unit

Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev am: 9797a39ad7

2017-04-26 18:54:10 +00:00

Android.mk

…