OSDN Git Service

am a2b8a756: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:24:50 +0000 (09:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Oct 2012 16:24:50 +0000 (09:24 -0700)
commitf8a0f51d264a2cebf6f3429df4439a2971f7da7a
tree74f25fe97f8b088baeb209568355d5bf5c909198
parent049dd5ce0703d79a0ba78b2dc7945a74b6d9cc99
parenta2b8a756dba78e9c6e86717da0610e2826587ead
am a2b8a756: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a2b8a756dba78e9c6e86717da0610e2826587ead':