OSDN Git Service

am 203511fd: (-s ours) am 2aa0d2b3: am 05f23b7d: am cbd8267e: Add logging to various...
authorSeth Raphael <magicseth@google.com>
Wed, 30 Apr 2014 18:14:56 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:56 +0000 (18:14 +0000)
* commit '203511fd372df4e7f9c1a2e3b2822b60981e653f':


Trivial merge