OSDN Git Service

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

Change-Id: I71886bd5b0df497190ab6bd38f377c3a71053ba2


Trivial merge