OSDN Git Service

am 84d8513a: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 18:04:09 +0000 (11:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Aug 2012 18:04:09 +0000 (11:04 -0700)
* commit '84d8513a5c45fbafce3a2da3a51a438420cea85d':
  JOO38


Trivial merge