OSDN Git Service

am 2ee4be8d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:43:08 +0000 (07:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Oct 2012 14:43:08 +0000 (07:43 -0700)
commita1eeb3e9524ba6e91c870dc6ee82ab47d82521ad
tree15b25065ea5f0d816cac3f0d30b9c76a8f82255f
parent13cc47a6775cc471e1af80b8ec8a1fefb3cf3500
parent2ee4be8d3a8eb3355207d2549a7cd4ff6e0677ae
am 2ee4be8d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '2ee4be8d3a8eb3355207d2549a7cd4ff6e0677ae':