| commit | 6d44675bb4cad206d3acf6c5940f9fcd374a6f03 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon May 23 23:16:42 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 23 23:16:42 2016 +0000 |
| tree | 5b2c0a3720d319de0dc7b3c7396839fc4f8aef2b | |
| parent | d37cbe1f8ce842dbca3983a8ab0452fb627f776b [diff] | |
| parent | 19db724cf7fd94b16edc41490c01a30e243df70d [diff] |
Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0 -s ours am: 8fd39c4420 am: 19db724cf7 * commit '19db724cf7fd94b16edc41490c01a30e243df70d': limit mediaserver memory Change-Id: Ifbda831e5a2f3cb57b6a5248e43dfb29c8cf9d57