| commit | 1094b530ad2189ab879ef0bc20bae820b3d12c86 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon May 23 23:02:59 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 23 23:02:59 2016 +0000 |
| tree | 8ba862ff53608e0b36b7ae8d54125ca077dc000e | |
| parent | 57dc6d9dce0bbafa442fda41f98da858b89c5059 [diff] | |
| parent | 61a1371ea195495c4bf2fe30812cce9275674c08 [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 * commit '61a1371ea195495c4bf2fe30812cce9275674c08': DO NOT MERGE limit mediaserver memory Change-Id: I8939080db97ba4a7bfc6d858ec6d6bc1e8296868