OSDN Git Service

am af503b04: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 13:02:20 +0000 (06:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Oct 2012 13:02:20 +0000 (06:02 -0700)
commitac2e710afe3f1a5059710135da8c5a256fa41024
tree9cd528aeb893f4fa1505d5cfa4863ce936a160e2
parentdfe087fce569ec6843a4f8c30a9d65533c085ab1
parentaf503b044475dc29ce58f715739158036807e94e
am af503b04: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'af503b044475dc29ce58f715739158036807e94e':