OSDN Git Service

am 843101be: (-s ours) am 9c5d0727: Override remote suspend flag on local play state...
authorAnubhav Gupta <anubhavg@codeaurora.org>
Thu, 27 Aug 2015 10:53:18 +0000 (10:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:53:18 +0000 (10:53 +0000)
* commit '843101be012626fcc5843269e8edc4ff592866d9':


Trivial merge