OSDN Git Service

Merge "DO NOT MERGE limit mediaserver memory" into klp-dev
authorMarco Nelissen <marcone@google.com>
Mon, 23 May 2016 22:46:23 +0000 (22:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 22:46:23 +0000 (22:46 +0000)
commit38ab87c3e3cd4868958fcec4d1591ebc4a9e8d1a
treef22a6040b40efbbb398dcc2bfc6a5e126787e0a0
parent9897bd43a614c28e6c52dcbce817d9ef6f201ccc
parentf8429c0c147b081ff6f06f55f8fa2f36fc60063e
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev
am: f8429c0c14

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

Change-Id: Ia88648ff82be88a90c98ded3061a6f04db74c03b