OSDN Git Service

am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:00:44 +0000 (13:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:00:44 +0000 (13:00 -0700)
commit50d36d58369cdf48bc6fcdba96b36c846be8587a
tree788563041118bb8b63b8bb0225227899a39ab7dc
parent6426bd62676c743b0b5bdc397bcab5c669c6e51f
parent75bcd737770f85114673c4411b8e2ecc0dd32bdf
am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '75bcd737770f85114673c4411b8e2ecc0dd32bdf':