am fede57e8: Merge "Do not require max components to be divisible by 4" into mnc...
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:38:17 +0000 (19:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:38:17 +0000 (19:38 +0000)
am: f1dc773366

* commit 'f1dc7733666b97f1511fd4643577e198f08e9004':


Trivial merge