tree dd736569a14bc74b62f140ee386341928653ed48
parent 6052b0c3e400e4c1085e8fed498e18023df75330
parent 0b104d630427c15f4001a4e6e1a333734c3c2126
author Pirama Arumuga Nainar <pirama@google.com> 1422305419 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422305419 +0000

am 0b104d63: Merge "Embed pragmas into object files"

* commit '0b104d630427c15f4001a4e6e1a333734c3c2126':
  Embed pragmas into object files