OSDN Git Service

am c519e72f: (-s ours) am 3bf6e581: am e46d0b50: Merge "Revert "Fuse long and FP...
authorRoland Levillain <rpl@google.com>
Thu, 27 Aug 2015 03:50:30 +0000 (03:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 03:50:30 +0000 (03:50 +0000)
* commit 'c519e72f6abdcac1d2ca5afd39440ddc6d087c3f':


Trivial merge