Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev am: 2dec0c7839
am: c55d3e0ee8
* commit 'c55d3e0ee88dc8a062d9fae96b5a129c7936f220':
Change-Id: Iccc8edd8b5cefdfde26a907ec969328b3494f8ef
This commit is contained in: