tree 869d350bcec5789b51fe22b22a78ad79d9e68b9e
parent 64cae76fe0598fcb71e7e49d02fc34c3ab094707
parent f62690cdaf7e59019101b0b4edbaaffe15fd33db
author Yunlian Jiang <yunlian@google.com> 1486090126 +0000
committer android-build-merger <android-build-merger@google.com> 1486090126 +0000

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

Change-Id: If7255629f0be37af2c08da90e9010423d73decfc