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)
commitd2ef78f951432ec0b859d6d48affd256fa12c15d
treed78145ffe34091530f8d2c583de8d76671e4d250
parentf7edc813c7a1557f9190c0c5ab486090996fd871
parentb48d758f4e9de40b11685e437f5d9c30270ec268
Merge "Make inlines static" into stage-aosp-master am: b76693c9fc  -s ours am: 90492da5ed  -s ours
am: b48d758f4e  -s ours

Change-Id: I5c25a1f22fd007c345f7c9876d689f949e1fb67c