Selim Cinek 49cdbaa25f Merge "Changing the way the media image scales" into oc-dr1-dev ...

am: e06e3f97fc

Change-Id: I667f1ec67a02c5ae264115a5b8bbe06dedda1d34

2017-07-25 23:04:53 +00:00

..

android

Merge "Changing the way the media image scales" into oc-dr1-dev

2017-07-25 23:04:53 +00:00

google/android

…