Merge "Do not require max components to be divisible by 4" into mnc-dev
authorKalle Raita <kraita@google.com>
Mon, 8 Jun 2015 17:48:21 +0000 (17:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 8 Jun 2015 17:48:22 +0000 (17:48 +0000)

Trivial merge