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)
am: 49496305fa

Change-Id: Ibddf02770acad6c1039c42ea72d447a63a1300b3


Trivial merge