OSDN Git Service

am 803b245e: (-s ours) am 469dbc0a: (-s ours) Reconcile with jb-mr1-release - do...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:47:15 +0000 (12:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:47:15 +0000 (12:47 -0700)
* commit '803b245ef485f16245234a42b8885a2ec50c5e5a':


Trivial merge