OSDN Git Service

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


Trivial merge