OSDN Git Service

am e410946c: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 19:17:47 +0000 (12:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 26 Mar 2013 19:17:47 +0000 (12:17 -0700)
commita3a186eb9fcf4c159dbcb4db44ec2914c283b412
tree7c87d999ada0548db422e0912c604d784ae39bd3
parent329509a84a7c734b5165fd7ebd510c5f47aa90a9
parent28ac489c21587e30bf1a509b4e52bd10feb06b9e
am e410946c: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'e410946c085f6a6b679c5e597abf4b40dbd5ba28':