OSDN Git Service

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

Change-Id: I9a009c1c30356afb4727d6b19c3b1702d16393a5


Trivial merge