OSDN Git Service

am ecc21222: am f89aedbf: (-s ours) am 8eaf18b0: Merge "Documenting behavior of retur...
authorPaul Mclean <pmclean@google.com>
Thu, 27 Aug 2015 19:31:42 +0000 (19:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:31:42 +0000 (19:31 +0000)
* commit 'ecc212228a15d493d756b37820b9118fd0f01eb9':


Trivial merge