tree 9187533dfdf5d6bc4ca0076c205c31d3db13e368
parent e3c7e902e67458a9915e36daee56cba3eb5a2cb1
parent 6a3102cf40662a95ee0ac0aa724253c1f01abf13
author Stephen Hines <srhines@google.com> 1440652336 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652336 +0000

am 6a3102cf: (-s ours) am 9dcb2ce4: Merge "Cherry picked debug info fix from upstream MCLinker."

* commit '6a3102cf40662a95ee0ac0aa724253c1f01abf13':