am fede57e8: Merge "Do not require max components to be divisible by 4" into mnc-dev
authorKalle Raita <kraita@google.com>
Mon, 8 Jun 2015 18:22:52 +0000 (18:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jun 2015 18:22:52 +0000 (18:22 +0000)
* commit 'fede57e8f04a40f38e80594429ee5d08cf26a5a8':
  Do not require max components to be divisible by 4


Trivial merge