OSDN Git Service

am bdb1902b: am 85e0511b: (-s ours) am 304b01c2: Merge "Document what algorithms...
authorAlex Klyubin <klyubin@google.com>
Thu, 27 Aug 2015 18:18:36 +0000 (18:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:18:36 +0000 (18:18 +0000)
* commit 'bdb1902b1d3168cdb3589785fb684f1b8ae371e5':


Trivial merge