tree e6c1bcbadf2e1b6e8e7f40818667c4d7ace955bc
parent a512e16c8cb9509697a5f983b71987e7e0c91ba3
parent 06f4ccba53c17ecdeac0659a01f1d44ceddab521
author Aurimas Liutikas <aurimas@google.com> 1461964376 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1461964377 +0000

Merge changes I02a085bf,Id5433d1d

* changes:
  Add #ifndef checks for macros
  Clean up version test