OSDN Git Service

am f763b2fc: (-s ours) am 7c5109be: (-s ours) Reconcile with jb-mr0-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 02:06:47 +0000 (19:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Aug 2012 02:06:47 +0000 (19:06 -0700)
commit225590c05a304358d34cfffcdb408560fb4410cc
treeb7764606ec9511b54a1adba75c491a92f31f24b0
parent118343187a520ec6a3afa568b4a1d882fb697767
parentf763b2fc07ee79045ca6c47e54d09dec90694e6c
am f763b2fc: (-s ours) am 7c5109be: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'f763b2fc07ee79045ca6c47e54d09dec90694e6c':