OSDN Git Service

am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks...
authorElliott Hughes <enh@google.com>
Mon, 17 Aug 2015 21:15:40 +0000 (21:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Aug 2015 21:15:40 +0000 (21:15 +0000)
commit84d4917c7560da364eb8fe79353e046807beb416
tree209739704a79f211773a4ed6f08f78724cbe6bcc
parentcd3f875321a30f9cc21e631fa85f7fb12901b147
parent12cf0f9c4cf8e6aed738da7349f556bd716ec09e
am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."

* commit '12cf0f9c4cf8e6aed738da7349f556bd716ec09e':
  Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
tools/aapt/Resource.cpp
tools/aapt/XMLNode.cpp