OSDN Git Service

am 9fea43e9: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Sep 2012 17:07:54 +0000 (10:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Sep 2012 17:07:54 +0000 (10:07 -0700)
commit17c117f7a8f2ac0e790d6d6ff89976d55b4dece6
tree876f9d92ac2170a7f7afd9d18861762bec6fa99b
parent63e302a8c4f17582970433b316d5fec8da26a73c
parent9fea43e972e992964313377c3392d6c0fd762a44
am 9fea43e9: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9fea43e972e992964313377c3392d6c0fd762a44':