OSDN Git Service

Merge "Add an explicit definition of __ANDROID__=1"
authorBen Cheng <bccheng@google.com>
Thu, 12 Dec 2013 21:52:39 +0000 (21:52 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 12 Dec 2013 21:52:39 +0000 (21:52 +0000)

Trivial merge