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)
commitb38fe63b9a33c371320e9beb59012a38c8d73a7f
treef9042e0e81227bf2617b19b6e884c15221ee6956
parent2ae9dc726b991cf9b4ae2d4ac60a8d5d7a9da75d
parentf4e511ecf99dab30aeecba4ab1da29a3b89bbbaa
Merge "Revert "Remove __sinit and __sdidinit."" am: 0d89913e74
am: f4e511ecf9

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