OSDN Git Service

Reconcile with honeycomb-mr2-release honeycomb-LTE-release
authorJean-Baptiste Queru <jbq@google.com>
Tue, 7 Jun 2011 17:42:18 +0000 (10:42 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 7 Jun 2011 17:42:18 +0000 (10:42 -0700)
Change-Id: Id467baa2d2c87f9cf16ca4fb66be3a8a9f50008d


Trivial merge