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)
commit5d7b2778d0e9849fa601d722ec2efcee7d032d4f
tree22846204b0c043f47a9b103fe31c19319a3494e7
parentb8fa1240eedeb487a7ee0cf7d60e17bed9b25cf4
parent41829f30e60cdb7ae8eb1f0266834d245164f70e
resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp

Change-Id: I952d333c2e88b6b28663793046a136822d1b6838