OSDN Git Service

Merge "Don't use the overloadable attribute if we're not fortified." am: 112581a5e0
authorElliott Hughes <enh@google.com>
Thu, 15 Jun 2017 15:15:39 +0000 (15:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Jun 2017 15:15:39 +0000 (15:15 +0000)
am: 679913b7e1

Change-Id: I71a083c18b2a2a6213d16803ced588a875d9352a


Trivial merge