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:40:31 +0000 (19:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:40:31 +0000 (19:40 +0000)
am: 50defa5f73

* commit '50defa5f73bfd5922ba95be8340e5786d63d6356':


Trivial merge