tree 1a130ed4ae2a3a03371b7b01d2cbb1900719279d
parent 4c6556d17f4073ed0b4d11abf42df9c32c339291
parent d18bb120442fcc04efe269e6a26f83265eea40c8
author Marco Nelissen <marcone@google.com> 1440357564 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440357564 +0000

am d18bb120: am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memory

* commit 'd18bb120442fcc04efe269e6a26f83265eea40c8':
  Limit allocations to avoid out-of-memory