tree bd37874110062036781167499a93c0d2e178b511
parent 1df64d3278378d0d234be11cfeafec5e6a96bd2d
parent ecb0ad25c6be87570f31b652c24ff7f17a93813f
author Dan Albert <danalbert@google.com> 1424300669 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424300669 +0000

am ecb0ad25: am 37e933a7: Merge "Add extern "C" to all the headers."

* commit 'ecb0ad25c6be87570f31b652c24ff7f17a93813f':
  Add extern "C" to all the headers.