OSDN Git Service

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

Change-Id: I5c25a1f22fd007c345f7c9876d689f949e1fb67c


Trivial merge