tree ae01fb383865a90288f17d8c354a7eddff3dabb3
parent 19db724cf7fd94b16edc41490c01a30e243df70d
parent ad969657396ee14a17440d0f7b1540bf0f3ed8c2
author Marco Nelissen <marcone@google.com> 1464046420 +0000
committer android-build-merger <android-build-merger@google.com> 1464046420 +0000

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

* commit 'ad969657396ee14a17440d0f7b1540bf0f3ed8c2':
  DO NOT MERGE limit mediaserver memory

Change-Id: I9ec287879b3fe17e4fb69087dd4217b04c9f8cdd