OSDN Git Service

resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
authorNick Pelly <npelly@google.com>
Tue, 25 Jan 2011 18:20:02 +0000 (10:20 -0800)
committerNick Pelly <npelly@google.com>
Tue, 25 Jan 2011 18:20:02 +0000 (10:20 -0800)
commitbb635189fcc04da7271044b7b561b6a86bb0e2ba
tree6ef0a8feb57c4112b12022e195ae0182622cfb22
parent0047debd056174df9cb0cad3d47db6fbbd2af445
parente94ab5ebf80eb9e5b4695215f5879e00f5c1556f
resolved conflicts for merge of 12619677 to honeycomb-plus-aosp

Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e