tree 0e0d0188c3b318c627361ff8eb7242072ea6ff65
parent 1690bd65edcf6894766a90f90fd09dc65518667d
parent 25bce096cefe4bcd8266d6306e5f9915909134c7
author Robert Sesek <rsesek@google.com> 1474049559 +0000
committer android-build-merger <android-build-merger@google.com> 1474049559 +0000

Merge "Move art::Runtime::InitZygote logic from art into frameworks/base." am: 9c08f6bb82 am: 9c24e04b9e am: a139f6bb27
am: 25bce096ce

Change-Id: I32dcf0cfe09a52a756f794e07ab2e76dc27c47a3