OSDN Git Service

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

Change-Id: Iad102434f85ddf68f5d2a67796bb4adc472bebf2


Trivial merge