OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 16:49:43 +0000 (08:49 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 16:49:43 +0000 (08:49 -0800)
commit25e3f42871569d5801082825b48c60330d9b60e0
tree1dee373b08a4d64d93822a10adb2befdab9b1bd8
parent5a6e24074851fba5fb40b4f453d1a18852053ffa
parent2a3cf767b6628fd7584f714d5e673f85a8730014
parent39737e6a2d2ff20352875b093912ce433fcbb3ec
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ie4f29093944bea7faa6eb3b3afaf098336c761ba