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)
commitf8ae91e3683828e456f5a710dd0a11b8d654bc13
tree0aebcfd48ce93447ba4376b4aeb0f0dcaa5edc4e
parent7a800d960a76b7f845eed7639176592582ce6efe
parent9c99a1cf3c6e6ab6bb796dd28e5f514cf7d32b4c
Merge "Make inlines static" am: e338b979f9  -s ours
am: 9c99a1cf3c  -s ours

Change-Id: Iad102434f85ddf68f5d2a67796bb4adc472bebf2