OSDN Git Service

am f89aedbf: (-s ours) am 8eaf18b0: Merge "Documenting behavior of returning a 0...
authorPaul Mclean <pmclean@google.com>
Thu, 27 Aug 2015 10:02:39 +0000 (10:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:02:39 +0000 (10:02 +0000)
* commit 'f89aedbf8b63bc92da2c5957402d164e04a9e891':


Trivial merge