OSDN Git Service

am e666ccd6: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Oct 2012 14:37:18 +0000 (07:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Oct 2012 14:37:18 +0000 (07:37 -0700)
commit47be125eca98c2a3802395d8b86234511a383fd6
tree43610f1c7b55d3087eef3615f110d0ae616439c2
parent4b92af0376fa302b18476a56e26b4fde646d1d09
parente666ccd6ab00d689819b537e51ab9b965f8a433a
am e666ccd6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'e666ccd6ab00d689819b537e51ab9b965f8a433a':