OSDN Git Service

Merge "Update makefiles." am: bbf39eb0b9
authorSteven Moreland <smoreland@google.com>
Wed, 12 Apr 2017 17:25:05 +0000 (17:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 17:25:05 +0000 (17:25 +0000)
am: 3334081377

Change-Id: Ib76fd65166dd7358b11225a3bf7e1c1b0338fe08


Trivial merge