OSDN Git Service

am 5e86fd15: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 Dec 2012 17:51:20 +0000 (09:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Dec 2012 17:51:20 +0000 (09:51 -0800)
commit92117a72eb8a01985c4385dadeeddb7aa2ad6588
treeebc9e34c045edd58d226bd988f2b018dc1d1a49d
parent66f20bbe1ab29b84334e7a3177e2a5517c096547
parent5e86fd1570b943e02d8435b2ce27a1806b72ee2c
am 5e86fd15: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '5e86fd1570b943e02d8435b2ce27a1806b72ee2c':