jackqdyulei 7de9af3b8f Merge "Hide wifi and bt in battery settings" into oc-dev ...

am: 05777a7918

Change-Id: I2c12178379cfed44d6007533f420c7611038bfed

2017-06-20 23:03:00 +00:00

..

app

Merge "Misc fixes for notification" into oc-dev

2017-06-19 14:47:34 +00:00

robotests

Merge "Hide wifi and bt in battery settings" into oc-dev

2017-06-20 22:35:59 +00:00

unit

Merge "Add more sane multi-profile app attribution." into oc-dev

2017-06-19 17:45:31 +00:00

Android.mk

Change build targets for settings tests

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