OSDN Git Service

Merge "Make inlines static"
authorColin Cross <ccross@android.com>
Sat, 1 Jul 2017 04:05:27 +0000 (04:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 1 Jul 2017 04:05:27 +0000 (04:05 +0000)
am: e338b979f9  -s ours

Change-Id: I2a94c355f424a516069077cb3aa8d4dd1d5cd716


Trivial merge