OSDN Git Service

am 5fd0cfaf: (-s ours) am 5f0196cc: am 46bfe63d: (-s ours) DO NOT MERGE AVRCP: Proper...
authorMallikarjuna GB <gbmalli@codeaurora.org>
Sat, 25 Oct 2014 19:54:50 +0000 (19:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 25 Oct 2014 19:54:50 +0000 (19:54 +0000)
* commit '5fd0cfafa6237e33b551ec81f4413e5c590b08ad':


Trivial merge