OSDN Git Service

Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3
authorMarco Nelissen <marcone@google.com>
Mon, 23 May 2016 22:54:45 +0000 (22:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 22:54:45 +0000 (22:54 +0000)
commitcbe776167a52a43f6acbafd3278e662840a256c2
tree5cbca8835b3e060748db10f0c44bdfb72edb5fc3
parent41e0a503e6f0c124208a7b9a8fa7321656359407
parente816dcc0b3ea6d5cee3b0b4ff230a20ab85b5996
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3
am: e816dcc0b3  -s ours

* commit 'e816dcc0b3ea6d5cee3b0b4ff230a20ab85b5996':
  DO NOT MERGE limit mediaserver memory

Change-Id: Ia2bb13dbcbe30984d86c1a625ded2db5ddbbca2d