| commit | 34f2112ab6d3c9dfa90b701eacd69660b7164d28 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon May 23 23:55:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 23 23:55:24 2016 +0000 |
| tree | 928a535a509ef23a8c5dda984e2ee18fa7959db9 | |
| parent | 4ecb8af13a00dd6331a3e957af5c3230f537e923 [diff] | |
| parent | d20ead8456870de4d8f6030c71b0cb91e5af4d8a [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 am: ad96965739 am: c5774baa39 am: 9c0ffb143f am: d20ead8456 -s ours * commit 'd20ead8456870de4d8f6030c71b0cb91e5af4d8a': DO NOT MERGE limit mediaserver memory Change-Id: I931ac36d5f1b02c4accfef3124df19cce0b27872