OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 21:26:37 +0000 (13:26 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 21:26:37 +0000 (13:26 -0800)
commit34d12aaf7ab9162fe891458d45a130e93e9cbc34
tree1dee373b08a4d64d93822a10adb2befdab9b1bd8
parent25e3f42871569d5801082825b48c60330d9b60e0
parentd67bdb4b10463bda6c7fd2459759c9a870d4e329
Reconcile with jb-mr1-release - do not merge

Change-Id: I2c8f0cf7f655c624f2c72ed967dba6b071e8fe6e