| commit | 9c0ffb143f2d202f3a10a66c449e461b143f4726 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon May 23 23:44:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 23 23:44:12 2016 +0000 |
| tree | 5b2c0a3720d319de0dc7b3c7396839fc4f8aef2b | |
| parent | 6d44675bb4cad206d3acf6c5940f9fcd374a6f03 [diff] | |
| parent | c5774baa39f3e1acb83036d18723cc00a3ec9d7a [diff] |
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 am: 1094b530ad am: 5440301701 -s ours am: ad96965739 am: c5774baa39 * commit 'c5774baa39f3e1acb83036d18723cc00a3ec9d7a': DO NOT MERGE limit mediaserver memory Change-Id: I9b50191fc9eb17f268d12f5c18116025597dc927