OSDN Git Service

am aca1bb4a: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 15 Dec 2012 00:48:47 +0000 (16:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 15 Dec 2012 00:48:47 +0000 (16:48 -0800)
commit237068555346f7763a97a3aed67157ddf902a3b0
treef08dfcd96d7580ee6556b11ce23245c22329f89a
parentf189a15dbd7a3b16da2ba77978d2981e04c8e5f3
parentaca1bb4ab86f3b27df72db37cab6bc3ccca088a9
am aca1bb4a: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'aca1bb4ab86f3b27df72db37cab6bc3ccca088a9':