| commit | ad969657396ee14a17440d0f7b1540bf0f3ed8c2 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon May 23 23:21:53 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 23 23:21:53 2016 +0000 |
| tree | 1ab8feb970a3ba6fee3b74a6f81e7098ddabd03a | |
| parent | 8fd39c4420aaa0dd64606b8f4f0d98b4bf7f6297 [diff] | |
| parent | 544030170121bd1220163ebf1c5de397a1f1bbcd [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 am: 5440301701 -s ours * commit '544030170121bd1220163ebf1c5de397a1f1bbcd': DO NOT MERGE limit mediaserver memory Change-Id: I3f4a3d0c9d01e53c6d34a471afa9c9e6d922e7e0