OSDN Git Service

am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:56:10 +0000 (12:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:56:10 +0000 (12:56 -0700)
commit63e1a5a9076f90e9e704e06956ba414a1d28c6a3
tree616c1fe17f77b10f8bdbd520c4b06af4f08ede96
parent11c51d455514074402c92c7edb4fc6f41e81664b
parent4c13ac4382d3bde4eb8b3c448a8ee6cb05a541d0
am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4c13ac4382d3bde4eb8b3c448a8ee6cb05a541d0':