Adrian Roos 153159130f Merge "AOD: Prolong AOD2 after interaction, turn off AOD when prox covered" into oc-dev
am: 490ef3cda4

Change-Id: I6a808b422c23e0bd695d8422150e57ed9cf874ad
2017-04-15 01:58:55 +00:00
..