tree 14f1c050712c6f62e5a3888b5fb37f0a99b4f149
parent f9e7e4da5f7b68bc08e022dcc49148b73d009367
parent 06984dc5791187ac9b3e73dc0f4dd3f35c3ae23c
author Stephen Hines <srhines@google.com> 1443682159 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443682159 +0000

am cabf610d: am d29f10cd: Merge "Fix build break due to unknown pragma (on gcc)."

* commit 'cabf610da0799abc302233acf4b3c420543a9c04':
  Fix build break due to unknown pragma (on gcc).