OSDN Git Service

am ffc3da39: (-s ours) am 9b3c0bc9: am 398d655f: am d381eb95: Merge "Adding link...
authorEric Gilmore <egilmore@google.com>
Thu, 27 Aug 2015 10:35:12 +0000 (10:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:35:12 +0000 (10:35 +0000)
* commit 'ffc3da39d66a35b23207fd4afe85dc2fa535ec84':


Trivial merge