OSDN Git Service

resolved conflicts for merge of 914ed90f to honeycomb-LTE
authorIrfan Sheriff <isheriff@google.com>
Wed, 22 Jun 2011 18:01:16 +0000 (11:01 -0700)
committerIrfan Sheriff <isheriff@google.com>
Wed, 22 Jun 2011 18:01:16 +0000 (11:01 -0700)
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e


Trivial merge