OSDN Git Service

am 565af383: am 33adccd2: am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:44:36 +0000 (13:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:44:36 +0000 (13:44 -0700)
* commit '565af3834c8c4c353fd9bbdffcf2b7817b55f09b':


Trivial merge