| commit | d20ead8456870de4d8f6030c71b0cb91e5af4d8a | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon May 23 23:49:48 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 23 23:49:48 2016 +0000 |
| tree | 49ed0cc9f3de761a2a79a1512007b0116017cd35 | |
| parent | 3d5d8388ba21a2d03316ca1f9d071670fc71822f [diff] | |
| parent | 9c0ffb143f2d202f3a10a66c449e461b143f4726 [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 am: 9c0ffb143f * commit '9c0ffb143f2d202f3a10a66c449e461b143f4726': DO NOT MERGE limit mediaserver memory Change-Id: I5a6227aeed02d5b56a8ea9aa81c7b86cf9d6ef17