OSDN Git Service

Merge "Updates Android to reflect upstreaming of guards on npruntime.h includes"
authorSteve Block <steveblock@google.com>
Wed, 17 Feb 2010 11:34:05 +0000 (03:34 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 17 Feb 2010 11:34:06 +0000 (03:34 -0800)
commit94aaff810652166341ada5e0ced7493cc88f4d48
tree3be5f3f8c60427707f623dc9386899d967fa72aa
parentefee84dc0e79e8ff997f7a4ecb9ac67172031435
parent95529a8f8ad447186cf045cae6538b704bbae05a
Merge "Updates Android to reflect upstreaming of guards on npruntime.h includes"