Adrian Roos 2e3ef5bdfd Merge "AOD: Disable not-yet-ready always-on feature" into oc-dev ...

am: 62643dddc7

Change-Id: I7d7ae07607181559576d4dbd53ff7ef441c6ded3

2017-05-10 00:45:37 +00:00

..

android

Merge "AOD: Disable not-yet-ready always-on feature" into oc-dev

2017-05-10 00:45:37 +00:00

google/android

…