OSDN Git Service

Merge "Update makefiles from anywhere." am: a24592b396
authorSteven Moreland <smoreland@google.com>
Fri, 12 May 2017 21:49:39 +0000 (21:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 May 2017 21:49:39 +0000 (21:49 +0000)
commit40699c4d25abd82bf2bcae8e11d98a33487ca1e6
tree5300a18961b54e8d70097cdb53ea2f85041bb198
parentf56e2909f9f2d3c2a7ca92a78fd7cdae77947338
parent1ad1c673db6160ce8bcec45fc9f75fce729c827e
Merge "Update makefiles from anywhere." am: a24592b396
am: 1ad1c673db

Change-Id: I40076615df8cd0b520f19c496e5d8ee8de5f6094