am 01023122: am e1086a8c: am fede57e8: Merge "Do not require max components to be...
authorKalle Raita <kraita@google.com>
Mon, 8 Jun 2015 20:15:18 +0000 (20:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jun 2015 20:15:18 +0000 (20:15 +0000)
* commit '010231228b8009010ad08123cffd275f229b5fa8':
  Do not require max components to be divisible by 4


Trivial merge