OSDN Git Service

Merge "Revert "Remove __sinit and __sdidinit."" am: 0d89913e74
authorElliott Hughes <enh@google.com>
Sat, 5 Dec 2015 02:01:42 +0000 (02:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 5 Dec 2015 02:01:42 +0000 (02:01 +0000)
am: f4e511ecf9

* commit 'f4e511ecf99dab30aeecba4ab1da29a3b89bbbaa':
  Revert "Remove __sinit and __sdidinit."


Trivial merge