| commit | 8a6df6ed8a8f98555063dbf92e03edb66d1d7d9f | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 27 20:37:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:37:09 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | 7e4b9611aecdb12869bdc180d6d2f716a3e2f0a4 [diff] | |
| parent | 7c2442acb3a3a59e3c86d9a0637e7122c20c9ed4 [diff] |
am 7c2442ac: am 15ee16f7: (-s ours) am f539b820: am a6bafbc5: am 2c02f5ee: am 719cd33e: am 492bba08: am d18bb120: am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memory * commit '7c2442acb3a3a59e3c86d9a0637e7122c20c9ed4':