OSDN Git Service

Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c...
authorMarco Nelissen <marcone@google.com>
Mon, 23 May 2016 23:07:11 +0000 (23:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 23:07:11 +0000 (23:07 +0000)
am: 1094b530ad

* commit '1094b530ad2189ab879ef0bc20bae820b3d12c86':
  DO NOT MERGE limit mediaserver memory

Change-Id: I65c6ecb4787ab13560686b47b2cd970c54bd1118


Trivial merge