OSDN Git Service

Merge "Fix makefile include for support-v4" into oc-dev
authorAlan Viverette <alanv@google.com>
Thu, 11 May 2017 05:39:02 +0000 (05:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 May 2017 05:39:02 +0000 (05:39 +0000)
commiteee86809398e12c9b9f88bcfbc0716ce798dcac5
tree4c7050d14790ec25f67bd9c2de346d326488497b
parentbd69754242c9203372c1fe18db01cc220cd28bd5
parent49496305fafa26e9a07897b914579adf84a89874
Merge "Fix makefile include for support-v4" into oc-dev
am: 49496305fa

Change-Id: Ibddf02770acad6c1039c42ea72d447a63a1300b3