OSDN Git Service

Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6
authorMarco Nelissen <marcone@google.com>
Mon, 23 May 2016 22:54:44 +0000 (22:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 22:54:44 +0000 (22:54 +0000)
commit57dc6d9dce0bbafa442fda41f98da858b89c5059
tree8ba862ff53608e0b36b7ae8d54125ca077dc000e
parentf55cac801a7678b58d16196b42d8110f67684024
parent76f9ec33f0e0ac80904b1cebe50b5d2bb3ccaf07
Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6
am: 76f9ec33f0

* commit '76f9ec33f0e0ac80904b1cebe50b5d2bb3ccaf07':
  limit mediaserver memory

Change-Id: Ib771b5daec2ce2dd981193b1425002f8bc7db2e7