| commit | 3d5d8388ba21a2d03316ca1f9d071670fc71822f | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon May 23 23:21:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 23 23:21:52 2016 +0000 |
| tree | 49ed0cc9f3de761a2a79a1512007b0116017cd35 | |
| parent | 05a8e6d6d9bcdeda1fa6196e0916d70d1d8ae440 [diff] | |
| parent | 6d44675bb4cad206d3acf6c5940f9fcd374a6f03 [diff] |
Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0 -s ours am: 8fd39c4420 am: 19db724cf7 am: 6d44675bb4 * commit '6d44675bb4cad206d3acf6c5940f9fcd374a6f03': limit mediaserver memory Change-Id: I1dcd190751f2233c9f73b46a9a742187d4f43a79