OSDN Git Service

Merge changes from topic "explicit_shared_compile_reason_cherrypick" am: 5e5fc34b42...
authorCalin Juravle <calin@google.com>
Thu, 2 Nov 2017 19:27:01 +0000 (19:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Nov 2017 19:27:01 +0000 (19:27 +0000)
am: 0cff77d293  -s ours

Change-Id: I2126bc739af9dffe7cacbf9567da065adc3a875b


Trivial merge