tree aa03098877d3375a6dad77959f2c870edfc22db2
parent e17248159a29bc5e16945c2ebb8a532a38de9033
parent 546ca1b0134c7b8d73261d6e190a9d9bad416687
author Andreas Gampe <agampe@google.com> 1470881349 +0000
committer android-build-merger <android-build-merger@google.com> 1470881349 +0000

Merge "ART: Check for more low-space situations in zygote" into nyc-mr1-dev
am: 546ca1b013

Change-Id: I9a6e6f16636c369eb03e407a47e083183c465732