tree 92b82db26f1566614386af41ae84f67a233e400b
parent 2cfd0e08e97a913450713c7f0c542d095fa00aae
parent a9ea1e4d99ca0f7872824c0bca3f357ab04b6f33
author Peter Enderborg <peter.enderborg@sonymobile.com> 1479511521 +0000
committer android-build-merger <android-build-merger@google.com> 1479511521 +0000

Merge "Add support for max_comp_streams option for zram"
am: a9ea1e4d99

Change-Id: I0ef7127e1352b7dc9ae226bee7fe340d864f97ab