commit | cbe776167a52a43f6acbafd3278e662840a256c2 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Mon May 23 22:54:45 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon May 23 22:54:45 2016 +0000 |
tree | 5cbca8835b3e060748db10f0c44bdfb72edb5fc3 | |
parent | 41e0a503e6f0c124208a7b9a8fa7321656359407 [diff] | |
parent | e816dcc0b3ea6d5cee3b0b4ff230a20ab85b5996 [diff] |
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