OSDN Git Service

am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Wed, 27 Feb 2013 06:26:28 +0000 (06:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 Feb 2013 06:26:28 +0000 (06:26 +0000)
commit63c34b5e2aae446b76fdf34f0ff895e35cd7376a
treeb614ad8f88ff0740115768137f9e2f503d4fb1a5
parentcbac7aed2621a0d51ecddf89af0b3c4a110a17df
parent68719a176eacf86d19813a38f59041f3b209693d
am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '68719a176eacf86d19813a38f59041f3b209693d':