Merge "Fix image memory requirements for compressed formats in null driver" into...
authorPyry Haulos <phaulos@google.com>
Thu, 21 Jan 2016 16:51:08 +0000 (16:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Jan 2016 16:51:08 +0000 (16:51 +0000)

Trivial merge