OSDN Git Service

am 721876d1: (-s ours) am dbe1a24d: am f6162c80: (-s ours) Reconcile with jb-mr0...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 21:55:10 +0000 (14:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Jul 2012 21:55:10 +0000 (14:55 -0700)
commit996a33fab6563ee37b292aca8d47dc7372492bb9
treea7bcc6388406f2bf9a222b7c40d2689111b04640
parente35294681539839dc6484a8ae48a35974d34f7d3
parent721876d13fb40b2c2a568ccdf6f989511991decd
am 721876d1: (-s ours) am dbe1a24d: am f6162c80: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '721876d13fb40b2c2a568ccdf6f989511991decd':