OSDN Git Service

am a6db845d: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 22:04:04 +0000 (15:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Jul 2012 22:04:04 +0000 (15:04 -0700)
* commit 'a6db845d24104eca99a0174af9fcaa713e838517':
  JOO31B
  JOO31


Trivial merge