tree e28f77a112f239aa222dc4cd7c481e117a8f3a93
parent 0a1ad585182268704e9aa74bc1c77d03446ed7a7
parent 679913b7e1e48e62df5ab1adc9de644848749619
author Elliott Hughes <enh@google.com> 1497539739 +0000
committer android-build-merger <android-build-merger@google.com> 1497539739 +0000

Merge "Don't use the overloadable attribute if we're not fortified." am: 112581a5e0
am: 679913b7e1

Change-Id: I71a083c18b2a2a6213d16803ced588a875d9352a