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:35 +0000 (21:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Aug 2015 21:15:35 +0000 (21:15 +0000)
commitbda7780daedf017b46da61610ea4c0fa93e8d82c
treed0fb2e5d06254b680a8089445b96e9f01fc51979
parent1090412f6019528fe2a314d69868449ca02397c7
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