OSDN Git Service

am 7eefa322: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 Dec 2012 21:00:54 +0000 (13:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Dec 2012 21:00:54 +0000 (13:00 -0800)
commiteefde6d4e06ed6371b58d177e3fefa999ed2d038
treedc8ece8f2dc801b48783c7272503ef51c5e42f73
parentfd66b1387f2db58f33a348704757c8e6991d8ebe
parent7eefa3225a1fad9fdd6c133edc2dfd798df6697e
am 7eefa322: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '7eefa3225a1fad9fdd6c133edc2dfd798df6697e':