tree 875b309f0432572f402660e0e7df922047ee1d10
parent b209b64a871f7180eaecf89f0756bd0d19359ae5
parent 57dc6d9dce0bbafa442fda41f98da858b89c5059
author Marco Nelissen <marcone@google.com> 1464044331 +0000
committer android-build-merger <android-build-merger@google.com> 1464044331 +0000

Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0
am: 57dc6d9dce

* commit '57dc6d9dce0bbafa442fda41f98da858b89c5059':
  limit mediaserver memory

Change-Id: Id57767343c25b32bf523ac1c5f421f2f38fb68ad