From: Glenn Kasten <gkasten@google.com>
Date: Wed, 17 Aug 2016 01:52:52 +0000 (+0000)
Subject: Merge "Fix a typo in pre-compiler error message" am: 7cc80100e1
X-Git-Tag: android-x86-8.1-r1~196^2~435^2~121
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f8e28f23399614da031c8a2be0009b58532e60a3;p=android-x86%2Fsystem-bt.git

Merge "Fix a typo in pre-compiler error message" am: 7cc80100e1
am: 8461b92874

Change-Id: Ib09fa2926b76be300f31f9144356742ca7106b03
---

f8e28f23399614da031c8a2be0009b58532e60a3