OSDN Git Service

am a6dd202d: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 Dec 2012 17:46:45 +0000 (09:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Dec 2012 17:46:45 +0000 (09:46 -0800)
commit17653f566d74d3ffd4c82093c1a784a45f358381
tree7a83ce90d31030d00e5ab9d8fb08ac5819507442
parenteaac5df7bced0a35d5163a135b795f8fa7d59537
parenta6dd202da14c2a0e75ea03807458f5c8cd319888
am a6dd202d: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'a6dd202da14c2a0e75ea03807458f5c8cd319888':