OSDN Git Service

resolved conflicts for merge of 08c39c6a to honeycomb-LTE
authorBenoit Goby <benoit@android.com>
Tue, 12 Apr 2011 01:41:23 +0000 (18:41 -0700)
committerBenoit Goby <benoit@android.com>
Tue, 12 Apr 2011 01:41:23 +0000 (18:41 -0700)
commit29d013afa943fb8f4fbd7b7367c0aa6a9884ff32
tree2aa2cb6936c908494527967d2b865eaf6392b787
parent2c287e4572407ebb8a332467aa673110b1adcc82
parentd0277b0001d66a942952d31c037399b881f1980e
resolved conflicts for merge of 08c39c6a to honeycomb-LTE

Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92