OSDN Git Service

Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev
authorDianne Hackborn <hackbod@google.com>
Thu, 12 May 2016 00:51:36 +0000 (00:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 May 2016 00:51:36 +0000 (00:51 +0000)
commitc55d3e0ee88dc8a062d9fae96b5a129c7936f220
tree0729cbe889da392f41ce4bff184f0f6ccfd3af34
parent8b649c055859e9d67353980aaf1dd2c62bdcfe06
parent2dec0c7839784940601df3f2110a552a5cf73400
Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev
am: 2dec0c7839

* commit '2dec0c7839784940601df3f2110a552a5cf73400':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: Id9e43e234b5aaac86dd94d36ccd051d22ad5bdd4