From: Nicolas Geoffray <ngeoffray@google.com>
Date: Wed, 5 Mar 2014 18:11:02 +0000 (+0000)
Subject: am 769a191f: am 50fcf753: am db48d145: am 247dd0c4: Merge "Do not remove the generate... 
X-Git-Tag: android-x86-6.0-r1~1987
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a6edb7a0e1e8b0d11ff7dd93bdaaf6baca313bba;p=android-x86%2Fbuild.git

am 769a191f: am 50fcf753: am db48d145: am 247dd0c4: Merge "Do not remove the generated .hpp file from yacc."

* commit '769a191fd6423bbe36d6eef513be1aafa734a10f':
  Do not remove the generated .hpp file from yacc.
---

a6edb7a0e1e8b0d11ff7dd93bdaaf6baca313bba