Selim Cinek 7b5e9c2cff Merge "Fixed that the status icons were showing in the camera" into oc-mr1-dev am: 02f8fa9603 ...

am: f3dbfd5e88

Change-Id: I0a05c16dda34fdb75c6f5d0a5c27e59b0ba01783

2017-08-25 19:52:12 +00:00

..

android

Merge "Fixed that the status icons were showing in the camera" into oc-mr1-dev am: 02f8fa9603

2017-08-25 19:52:12 +00:00

google/android

…