OSDN Git Service

am c9b5f99c: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Dec 2012 23:23:15 +0000 (15:23 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 Dec 2012 23:23:15 +0000 (15:23 -0800)
commit136e104357f32520d81fb865d8ede5a91930b74a
tree43fbee2659a3728f97b93ec8a8c1c042b511f36f
parentff8da7a11a60bb9ad83cb6d04776e6b9fd37e032
parentc9b5f99c1d1404b02b123771357be32430363ba2
am c9b5f99c: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'c9b5f99c1d1404b02b123771357be32430363ba2':