OSDN Git Service

Merge "Entrypoints cleanup." am: 4507fdcb70 am: 33cced00b3
authorNicolas Geoffray <ngeoffray@google.com>
Wed, 18 Jan 2017 12:52:03 +0000 (12:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Jan 2017 12:52:03 +0000 (12:52 +0000)
am: 6396de7ce5

Change-Id: Ide7d612644c36ae7d525b17d144d476de8c30ebe


Trivial merge