tree 71eb536865b26d91fbdb3a5bcf7e473f4af247b9
parent 6583646a6b65ce16a03b41466eddd385234eb7eb
parent bb661c0f0cb72d4bbfc2e251f6ded6949a713292
author Roland Levillain <rpl@google.com> 1461589381 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1461589381 +0000

Merge "Refactor use of __ANDROID__ macro"