OSDN Git Service

Merge "Make inlines static" into stage-aosp-master
authorColin Cross <ccross@android.com>
Sat, 1 Jul 2017 04:23:23 +0000 (04:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 1 Jul 2017 04:23:23 +0000 (04:23 +0000)
commit90492da5ed85a127b4389b1ace67f956bbdef260
tree0aebcfd48ce93447ba4376b4aeb0f0dcaa5edc4e
parentf8ae91e3683828e456f5a710dd0a11b8d654bc13
parentb76693c9fc4315f49e59fac506f1be01d2208de9
Merge "Make inlines static" into stage-aosp-master
am: b76693c9fc  -s ours

Change-Id: I4145373db5dd90dfa52097c09221b64c2bd41f0e