tree 4716c1fc30106f2f9dec27f6984be60cca60cd7f
parent 12f87a5b7728d4e5af251c33f448ac7fc1868abb
parent 3342bf0fea22efeb3df0a4e3a3c50fb78ecf96ff
author Raphael Moll <ralf@android.com> 1383946577 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383946577 -0800

am 3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."

* commit '3342bf0fea22efeb3df0a4e3a3c50fb78ecf96ff':
  Windows SDK: define BEGIN_DECLS/END_DECLS.