OSDN Git Service

Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14
authorMarco Nelissen <marcone@google.com>
Mon, 23 May 2016 22:50:37 +0000 (22:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 22:50:37 +0000 (22:50 +0000)
commite816dcc0b3ea6d5cee3b0b4ff230a20ab85b5996
tree4d3e9bef2258720fb70694a3d6922e820fd220aa
parent8fd8bfdfbd930cdc669c4fc33d7d251f12ec7e5e
parent38ab87c3e3cd4868958fcec4d1591ebc4a9e8d1a
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14
am: 38ab87c3e3

* commit '38ab87c3e3cd4868958fcec4d1591ebc4a9e8d1a':
  DO NOT MERGE limit mediaserver memory

Change-Id: I053031830618e20ff830ae3c097abba10ae73cfc