tree 62d6a1d0bdc8e9689aeeb7560903c6ab471ba57b
parent e9cc4c3a0ac91af05bdb7b6bcc850e55b9e258f0
parent f539b8209b694d2173691f6517507db408e074c4
author Marco Nelissen <marcone@google.com> 1440458941 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440458941 +0000

am f539b820: am a6bafbc5: am 2c02f5ee: am 719cd33e: am 492bba08: am d18bb120: am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memory

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