From: Ying Wang <wangying@google.com>
Date: Fri, 6 May 2016 20:39:54 +0000 (+0000)
Subject: Merge "Fix LOCAL_CPP_EXTENSION." am: 2597f3521e am: abe624c78e
X-Git-Tag: android-x86-8.1-r1~68^2~342
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e5ff89825c79011758f63c3849f1d3da1cfeeaa1;p=android-x86%2Fsystem-extras.git

Merge "Fix LOCAL_CPP_EXTENSION." am: 2597f3521e am: abe624c78e
am: 52d8960892

* commit '52d896089282a7b651cd2eb4adac719b63e14c8a':
  Fix LOCAL_CPP_EXTENSION.

Change-Id: Ie190a5d2b689d7e655b3955a64095b4f2ea45cfb
---

e5ff89825c79011758f63c3849f1d3da1cfeeaa1