OSDN Git Service

am 3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:28:04 +0000 (12:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:28:04 +0000 (12:28 -0700)
* commit '3c73fdaad106c2bd5e9d9349aae13f07ec40a547':


Trivial merge