tree 29fc2e1fbc6afdadfcff33747543a6352e0ca30d
parent 2f7ebdd05b9076f81fcecfae5f5f679eb7bcb681
parent 323cb09f8965758e2ad4d4c0f7196d4307d2f953
author Chih-Hung Hsieh <chh@google.com> 1464121706 +0000
committer android-build-merger <android-build-merger@google.com> 1464121706 +0000

Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69 am: e3d129de20
am: 323cb09f89

* commit '323cb09f8965758e2ad4d4c0f7196d4307d2f953':
  Fix misc-macro-parentheses warnings.

Change-Id: Ic5337829ee5a53770f1f352cc5700defccffe8bd