OSDN Git Service

am 422446e1: (-s ours) am 4325cf22: am 7e107a09: (-s ours) Reconcile with jb-mr0...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 22:22:53 +0000 (15:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Aug 2012 22:22:53 +0000 (15:22 -0700)
commit227a1f66e7bd72ec63489699cfb357dbf0d52cb3
treee8d509aafbf27287ae7a14564af0199e5b09cd87
parent13568ef88072c38f5c4cef11c415abc81ef1f2ee
parent422446e1ef8d42501a72800f81037ff142119f62
am 422446e1: (-s ours) am 4325cf22: am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '422446e1ef8d42501a72800f81037ff142119f62':