OSDN Git Service

am 6bdeb448: am fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 22:16:15 +0000 (15:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Aug 2012 22:16:15 +0000 (15:16 -0700)
commit8d950f8424bd5f48ce51b09b915964ec109bef55
treef5e250c8294a948f3bf40c231125fe199e4c5e08
parent84d8513a5c45fbafce3a2da3a51a438420cea85d
parent6bdeb4481e3e447d5234426a6c9cc74cbf103bab
am 6bdeb448: am fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '6bdeb4481e3e447d5234426a6c9cc74cbf103bab':
  JZO38