OSDN Git Service

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:14:08 +0000 (15:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Aug 2012 22:14:08 +0000 (15:14 -0700)
commit6bdeb4481e3e447d5234426a6c9cc74cbf103bab
treef5e250c8294a948f3bf40c231125fe199e4c5e08
parentaad5e32f6ac517d24fa01b74172cec8085f19bda
parentfe9a455a24a863eaf96520b761ea284cc3cd15ee
am fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'fe9a455a24a863eaf96520b761ea284cc3cd15ee':
  JZO38