tree 3f58a14e261a756dd6aaa92b757294a1f51e4c6b
parent ae8393dd9704bf3f666affebf731042c0b62a37b
parent c7958c10f7c77bd2acd81bd3eb4997d5cd5a3047
author Aurimas Liutikas <aurimas@google.com> 1461964957 +0000
committer android-build-merger <android-build-merger@google.com> 1461964957 +0000

Merge changes I02a085bf,Id5433d1d am: 9643d9ce73 am: de735023f2
am: c7958c10f7

* commit 'c7958c10f7c77bd2acd81bd3eb4997d5cd5a3047':
  Add #ifndef checks for macros
  Clean up version test

Change-Id: If4210b1941f5986b88313920399f99e5805d2cc9