| commit | 7c2442acb3a3a59e3c86d9a0637e7122c20c9ed4 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 27 05:24:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:24:33 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | deeb6d1e01d5272dcf8d2e08e0c186873ce1e188 [diff] | |
| parent | 15ee16f7a2ae9207d12584acca2fa727c965fe35 [diff] |
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 '15ee16f7a2ae9207d12584acca2fa727c965fe35':