OSDN Git Service

am fe2e963c: am 937fc8d4: (-s ours) am 7d170797: Merge "Mute correct user from device...
authorKenny Guy <kennyguy@google.com>
Thu, 27 Aug 2015 16:09:50 +0000 (16:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 16:09:50 +0000 (16:09 +0000)
* commit 'fe2e963c926954ebb1af08cfdd8eba8b249a02a2':


Trivial merge