From: Nicolas Geoffray <ngeoffray@google.com>
Date: Wed, 18 Jan 2017 12:52:03 +0000 (+0000)
Subject: Merge "Entrypoints cleanup." am: 4507fdcb70 am: 33cced00b3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2b32b1d70d97b328141317ec89b5d10561982ff4;p=android-x86%2Fart.git

Merge "Entrypoints cleanup." am: 4507fdcb70 am: 33cced00b3
am: 6396de7ce5

Change-Id: Ide7d612644c36ae7d525b17d144d476de8c30ebe
---

2b32b1d70d97b328141317ec89b5d10561982ff4