tree 242079c8be90631150ef06bd149f69eeac5b3677
parent 03c34d997b4f8752dbe117558182ac0a22577ed3
parent acbde51e646fddeaddfea9d9dc027884260c5ac6
author Dmitry Shmidt <dimitrysh@google.com> 1478706628 +0000
committer android-build-merger <android-build-merger@google.com> 1478706628 +0000

hikey: Fix wpan warning including BOTHER redefinition am: 395b044f65 am: 1a21f03a01
am: acbde51e64

Change-Id: I354e4528d14f1017bf20ab544235d7d9bfd4e539