tree aa42de33fd927f3805c7995d123051f7ca8d13bc
parent 0cd2b051edfa94b5e3897adde70cce5fcf1ff304
parent 276b60e1be8ed92149411240d95705c642c7531a
author Chih-Hung Hsieh <chh@google.com> 1463683466 +0000
committer android-build-merger <android-build-merger@google.com> 1463683466 +0000

Merge "Fix misc-macro-parentheses warnings." am: 8a6d716a1e am: f89b497da8
am: 276b60e1be

* commit '276b60e1be8ed92149411240d95705c642c7531a':
  Fix misc-macro-parentheses warnings.

Change-Id: Ibcaee3a37f4529d9ce02f0f809f1948edb134929