tree f9042e0e81227bf2617b19b6e884c15221ee6956
parent 2ae9dc726b991cf9b4ae2d4ac60a8d5d7a9da75d
parent f4e511ecf99dab30aeecba4ab1da29a3b89bbbaa
author Elliott Hughes <enh@google.com> 1449280902 +0000
committer android-build-merger <android-build-merger@google.com> 1449280902 +0000

Merge "Revert "Remove __sinit and __sdidinit."" am: 0d89913e74
am: f4e511ecf9

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