OSDN Git Service

am c8cd7d93: am 8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 02:01:50 +0000 (19:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Aug 2012 02:01:50 +0000 (19:01 -0700)
commit32707597009c6a7b15113fb7dd4e89e029e96ff1
tree25c7018d0e08fac6c04f2657109b6947269e757a
parent5694cd0058b73b3458ccf76e3e42757cb0b15412
parentc8cd7d9335863d19a0a37569a4a539f13ebd1858
am c8cd7d93: am 8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'c8cd7d9335863d19a0a37569a4a539f13ebd1858':