OSDN Git Service

am 29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Jul 2013 22:37:11 +0000 (15:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jul 2013 22:37:11 +0000 (15:37 -0700)
commit6760cfd1a6d3982664275ae02835a3dd72b30cac
tree6485364758416639bcbfc8c74c7db2f25234b3ae
parent9046684244e6adaf4db46f1a5e5b1fea221cd781
parent291967728b02ad9a7d5545b0eb1ec0c4c3d664af
am 29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '291967728b02ad9a7d5545b0eb1ec0c4c3d664af':