OSDN Git Service

am afa83482: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Dec 2012 19:36:46 +0000 (11:36 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Dec 2012 19:36:46 +0000 (11:36 -0800)
commit15c0ba91397c4f4ef32f27e35d83b40c303bff3c
tree360d2cf9ec65fdc28ea1b5d65a12438ba8ade345
parent7e1820a7224c9b8726c1687924ff81dda20af5cc
parentafa8348248f9aa7cca59e1c74992fcd7ac6cbd90
am afa83482: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'afa8348248f9aa7cca59e1c74992fcd7ac6cbd90':