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

* commit 'e1086a8c31ca4ec7d87eb1a35031bc21e812df1e':


Trivial merge