OSDN Git Service

am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:41:55 +0000 (12:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:41:55 +0000 (12:41 -0700)
commit4c13ac4382d3bde4eb8b3c448a8ee6cb05a541d0
tree616c1fe17f77b10f8bdbd520c4b06af4f08ede96
parentd4715aa246786ee68b93d9eaef948fa4772b8fd8
parent73d8e5d2652b7fd50361d4fc4542140c62591404
am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '73d8e5d2652b7fd50361d4fc4542140c62591404':