OSDN Git Service

Merge "Don\'t reset LOCAL_*MODULE_STEM." am: e77e5e7 am: 07ad876
authorYing Wang <wangying@google.com>
Tue, 19 Apr 2016 21:05:33 +0000 (21:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Apr 2016 21:05:33 +0000 (21:05 +0000)
commit520a60f0ca2d121d66ad9c589bdaf30397b42a43
tree6d314cec6ea573aade6baae2b4acec7eb529852b
parent7ff01dbda466dfbc8d6386b1069aed2789792399
parent40c185f5457fb43273ed3b61db198cf953f959bc
Merge "Don\'t reset LOCAL_*MODULE_STEM." am: e77e5e7 am: 07ad876
am: 40c185f

* commit '40c185f5457fb43273ed3b61db198cf953f959bc':
  Don't reset LOCAL_*MODULE_STEM.

Change-Id: Ie31b27a81b306842ea82f2cbbb9d0cdec6e00d7f