OSDN Git Service

am c004cfd8: am b843601a: am 77acfc4d: (-s ours) am 3c73fdaa: (-s ours) Reconcile...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:44:17 +0000 (13:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:44:17 +0000 (13:44 -0700)
commit6bbf28da27dde1d3154456ab44a68ff62ee81c3c
tree5fa7786ade1bc93ac499db8db42eecdb9a7c64d3
parent286374f16610323722ae4a3871be4b8d4c2b0001
parentc004cfd80c5b54c971b8854fa1d10ee23be1c868
am c004cfd8: am b843601a: am 77acfc4d: (-s ours) am 3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c004cfd80c5b54c971b8854fa1d10ee23be1c868':