| commit | 61a1371ea195495c4bf2fe30812cce9275674c08 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon May 23 22:58:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 23 22:58:50 2016 +0000 |
| tree | 8ba862ff53608e0b36b7ae8d54125ca077dc000e | |
| parent | 76f9ec33f0e0ac80904b1cebe50b5d2bb3ccaf07 [diff] | |
| parent | cbe776167a52a43f6acbafd3278e662840a256c2 [diff] |
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours * commit 'cbe776167a52a43f6acbafd3278e662840a256c2': DO NOT MERGE limit mediaserver memory Change-Id: I271600c88d36fc23ecfaea51d6fc22f39546ea9f