OSDN Git Service

am c26c52a6: am e47881e6: am f8372271: (-s ours) am 17cbfdda: (-s ours) am 76bbd39a...
authorJean-Baptiste Queru <jbq@google.com>
Thu, 7 Mar 2013 20:21:25 +0000 (12:21 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Mar 2013 20:21:25 +0000 (12:21 -0800)
* commit 'c26c52a6a0d097e2e28804347d8b0ada758109fa':


Trivial merge