OSDN Git Service

resolved conflicts for merge of 267a6181 to honeycomb-LTE
authorIrfan Sheriff <isheriff@google.com>
Wed, 22 Jun 2011 05:46:51 +0000 (22:46 -0700)
committerIrfan Sheriff <isheriff@google.com>
Wed, 22 Jun 2011 14:11:42 +0000 (07:11 -0700)
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04


Trivial merge