OSDN Git Service

resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp
authorGlenn Kasten <gkasten@google.com>
Tue, 27 Nov 2012 23:05:48 +0000 (15:05 -0800)
committerGlenn Kasten <gkasten@google.com>
Tue, 27 Nov 2012 23:06:21 +0000 (15:06 -0800)
commit5dd0a57f26c6c8dadc35454e69813145141386c4
treef93944b829454836c0be7e602f6756243bc7cfe5
parentedac45119a3f37e3092911224385a390c123040e
parent5ad21fb5686d4d32f61a47eab5a3fd2c4670e32d
resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp

Change-Id: I952d333c2e88b6b28663793046a136822d1b6838