OSDN Git Service

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

Change-Id: I9500c90890e0ef29100cf2c976ddba851285d0aa


Trivial merge