OSDN Git Service

am 09a44f1e: (-s ours) am 4523c862: (-s ours) am 884cc475: am 5eaa09ff: (-s ours...
authorDeepanshu Gupta <deepanshu@google.com>
Fri, 28 Aug 2015 00:03:02 +0000 (00:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 00:03:02 +0000 (00:03 +0000)
* commit '09a44f1e4c6652d6db7de14b0cbd4c592ba5defb':


Trivial merge