| commit | 19db724cf7fd94b16edc41490c01a30e243df70d | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon May 23 23:11:48 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 23 23:11:48 2016 +0000 |
| tree | ae01fb383865a90288f17d8c354a7eddff3dabb3 | |
| parent | d3979cc41b2c5a5b462d9289056c53ff96640760 [diff] | |
| parent | 8fd39c4420aaa0dd64606b8f4f0d98b4bf7f6297 [diff] |
Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0 -s ours am: 8fd39c4420 * commit '8fd39c4420aaa0dd64606b8f4f0d98b4bf7f6297': limit mediaserver memory Change-Id: Icaf40b73d618baa486d00f1752d89c1ee9bd76d0