tree ae01fb383865a90288f17d8c354a7eddff3dabb3
parent d3979cc41b2c5a5b462d9289056c53ff96640760
parent 8fd39c4420aaa0dd64606b8f4f0d98b4bf7f6297
author Marco Nelissen <marcone@google.com> 1464045108 +0000
committer android-build-merger <android-build-merger@google.com> 1464045108 +0000

Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0  -s ours
am: 8fd39c4420

* commit '8fd39c4420aaa0dd64606b8f4f0d98b4bf7f6297':
  limit mediaserver memory

Change-Id: Icaf40b73d618baa486d00f1752d89c1ee9bd76d0