OSDN Git Service

Merge "Fix LOCAL_CPP_EXTENSION." am: 2597f3521e am: abe624c78e am: 52d8960892
authorYing Wang <wangying@google.com>
Fri, 6 May 2016 20:44:53 +0000 (20:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 May 2016 20:44:53 +0000 (20:44 +0000)
am: e5ff89825c

* commit 'e5ff89825c79011758f63c3849f1d3da1cfeeaa1':
  Fix LOCAL_CPP_EXTENSION.

Change-Id: I9f47289266502d0cce585227006406043ca08007


Trivial merge