OSDN Git Service

[automerger skipped] Merge "Track ZygoteHooks API changes in libcore" am: 20bca262f5...
authorNeil Fuller <nfuller@google.com>
Wed, 30 Jan 2019 11:29:43 +0000 (03:29 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Jan 2019 11:29:43 +0000 (03:29 -0800)
commit131f0814f360229a66afe0599c606416ca85a166
tree8cb079c1c674d57d63cb4e4cc8759fd0b6b0144a
parentaaf9b8883529e4b1a57017352effe2c464768684
parent6bdf43af582511ba6cc2ae26faaa061a2a369301
[automerger skipped] Merge "Track ZygoteHooks API changes in libcore" am: 20bca262f5 am: 97ba02c505
am: 6bdf43af58 -s ours
am skip reason: change_id Ie65aac6539cffc90663807791511b95a6cd61ab4 with SHA1 555d8b7eca is in history

Change-Id: Ib4983fe157f2a7dc7dfd9c052e44262d34479ec8