commit | 544030170121bd1220163ebf1c5de397a1f1bbcd | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Mon May 23 23:07:11 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon May 23 23:07:11 2016 +0000 |
tree | 875b309f0432572f402660e0e7df922047ee1d10 | |
parent | 4e61b921f04c068e88a7ab8561a6e054900f527e [diff] | |
parent | 1094b530ad2189ab879ef0bc20bae820b3d12c86 [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 * commit '1094b530ad2189ab879ef0bc20bae820b3d12c86': DO NOT MERGE limit mediaserver memory Change-Id: I65c6ecb4787ab13560686b47b2cd970c54bd1118