tree 8f5aa7ccc3403690ade9b3e622db5a83e3796f3e
parent d68b6dc56b2e0c3124ec53a791cf14a612fcc4a8
parent a8818f6b3159f7fcc18143a9b2d6d43ade93388d
author Selim Cinek <cinek@google.com> 1501022755 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501022755 +0000

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