OSDN Git Service

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

* commit '63da0db6333796d7b3a94af55de58039cea94b8d':