OSDN Git Service

Merge "Protect against monkey crash" into nyc-dev
authorJason Monk <jmonk@google.com>
Fri, 20 May 2016 18:24:35 +0000 (18:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 May 2016 18:24:35 +0000 (18:24 +0000)
commit00e73e75d5092a99fd58b1e0b86a7b5d9c3cbcfb
tree397a21c2e6a9e5e1463931beab7cb2d32f8c8d7a
parent2c04e724148556aacbb3956b39af04a16e2a385e
parentd3ce331b94af2c896864f78459c8656629d3455f
Merge "Protect against monkey crash" into nyc-dev
am: d3ce331b94

* commit 'd3ce331b94af2c896864f78459c8656629d3455f':
  Protect against monkey crash

Change-Id: Ie079d13887e9159d78ef5485bfa96878cee01d6a