OSDN Git Service

Merge changes from topic 'ab_sideload'
authorAlex Deymo <deymo@google.com>
Wed, 10 Aug 2016 05:00:57 +0000 (05:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Aug 2016 05:00:57 +0000 (05:00 +0000)
am: 3750ed3e17

Change-Id: I4afbecc40068c7a87c7532b22a404319c24e2c05

1  2 
core/Makefile

diff --cc core/Makefile
Simple merge