OSDN Git Service

resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp
authorJake Hamby <jhamby@google.com>
Tue, 7 Jun 2011 22:01:50 +0000 (15:01 -0700)
committerJake Hamby <jhamby@google.com>
Tue, 7 Jun 2011 22:01:50 +0000 (15:01 -0700)
commit5403b2a82d3f76299bd077c759a5827d2e0322a7
treeb73c9c65f0df4ca1d56376e414f032d4c35d4309
parent1676bf95dfdfcff72afadb9ddfc1b1d162dd0812
parenta5338831fac0761ba5de851f8ecde2bec5fdbddb
resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp

Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2