OSDN Git Service

am 8603c8ce: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:54:44 +0000 (07:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Nov 2012 14:54:44 +0000 (07:54 -0700)
commit3208d28bb3b77970ce4a172d741014291d36dd2f
tree92ce9ae2ad949fbc05dae5ec56c6c679fd0ca18d
parent719ae96a5308273100a68d112f131c61f9b3db81
parent8603c8ce359a8c69f83305aff3fe5fa26fe4ca0a
am 8603c8ce: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '8603c8ce359a8c69f83305aff3fe5fa26fe4ca0a':