OSDN Git Service

Merge "Make inlines static" into stage-aosp-master
authorColin Cross <ccross@android.com>
Sat, 1 Jul 2017 04:23:23 +0000 (04:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 1 Jul 2017 04:23:23 +0000 (04:23 +0000)
am: b76693c9fc  -s ours

Change-Id: I4145373db5dd90dfa52097c09221b64c2bd41f0e


Trivial merge