OSDN Git Service

Reconcile with honeycomb-mr2-release
authorJean-Baptiste Queru <jbq@google.com>
Tue, 7 Jun 2011 17:42:37 +0000 (10:42 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 7 Jun 2011 17:42:37 +0000 (10:42 -0700)
commit9578bde6a903925fbda2ecf738c7b00d6fa4026d
tree2bd2d1b474d8efa3b9a4384f7c2c664d08098d20
parent6b1325a0c75ad2ef912989682ad781cb7eeec5be
parent394fc5fd0cdec2a010afc4a55a548e5a3f9b90c9
Reconcile with honeycomb-mr2-release

Change-Id: Iec7f78f0f58c018ee36e67d6e8d89ca02d6a9383