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)
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92


Trivial merge