tree dd7dda51f453cea0bab7af135afa2b08e1140d84
parent d243f0b6c4ee88403904293cf1501832642f6ae2
parent ee13c1562c333ae79291ba528f1440dbdc62af32
author Elliott Hughes <enh@google.com> 1449532797 +0000
committer android-build-merger <android-build-merger@google.com> 1449532797 +0000

Merge "Revert "Revert "Remove __sinit and __sdidinit.""" am: c4eef1fb5b am: 568ad51d80
am: ee13c1562c

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