OSDN Git Service

am cc8fedd3: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:22:50 +0000 (09:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Oct 2012 16:22:50 +0000 (09:22 -0700)
commit6062eb0756cb94cd164223f5961091b78fcc43d4
treeabb3a4bf9214fc94115d65f4f7777f88b51fc843
parent2c72e9faa5ad5e324b85b78e383dd85c8bdc04a9
parentcc8fedd302110af6bd1cc3aa8268639ca64a9c46
am cc8fedd3: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'cc8fedd302110af6bd1cc3aa8268639ca64a9c46':