From: Yunlian Jiang <yunlian@google.com>
Date: Fri, 3 Feb 2017 02:46:15 +0000 (+0000)
Subject: Merge "Fix warning: macro redefined"
X-Git-Tag: android-x86-8.1-r1~377^2~44^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f62690cdaf7e59019101b0b4edbaaffe15fd33db;p=android-x86%2Fframeworks-native.git

Merge "Fix warning: macro redefined"
am: 909ef30a63

Change-Id: Ia1b083546fe41a81acf83e0cb0b8921700aa1bfa
---

f62690cdaf7e59019101b0b4edbaaffe15fd33db