OSDN Git Service

Fix makefile merge doubling
authorMarie Janssen <jamuraa@google.com>
Fri, 12 Feb 2016 19:37:13 +0000 (11:37 -0800)
committerMarie Janssen <jamuraa@google.com>
Fri, 12 Feb 2016 19:37:13 +0000 (11:37 -0800)
commit77ed1a9bbfc3707b7a25d4baa67ee5767826bdde
treeb49d5400e9a8d2331be07b5d40d1de493b07d053
parent16e7b03b3fe574de6d7e04ded636534dae739aa4
Fix makefile merge doubling

A merge doubled the targets in the Android.mk and broke the build.

Change-Id: Ieec7af5d3dbb735fd5a33990ba197e589341aced
osi/Android.mk