am 7ce9438a: am 0870de9a: (-s ours) DO NOT MERGE Do not require signed zero support...
authorPyry Haulos <phaulos@google.com>
Fri, 28 Aug 2015 04:10:53 +0000 (04:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 04:10:53 +0000 (04:10 +0000)
* commit '7ce9438a8d20895ed437bdbf838fea9c19c34d61':


Trivial merge