OSDN Git Service

am ae006e70: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 May 2013 14:27:38 +0000 (07:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 May 2013 14:27:38 +0000 (07:27 -0700)
commit38562ce3ae6577c43168b444f3578a5817457592
tree58713946df5592cf36762978502e8fe647bcc832
parentd08167e169f601d818d18ffa91b165f4bab1951b
parentae006e7077c9937bd90d08f7eea7fb7e580b1d57
am ae006e70: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'ae006e7077c9937bd90d08f7eea7fb7e580b1d57':