OSDN Git Service

resolved conflicts for merge of b842629c to honeycomb-plus-aosp
authorScott Main <smain@google.com>
Sat, 19 Feb 2011 03:42:29 +0000 (19:42 -0800)
committerScott Main <smain@google.com>
Sat, 19 Feb 2011 03:42:29 +0000 (19:42 -0800)
commitde80fa0a1c9217cdf6c92a1b2c1051c6dccc384b
tree2de34eaf949bd30904e7e7343a64fce86fec4561
parent286971d8653ca11caec47ac19b1170f27d5c8482
parentb5e284f670b68a1e297270c306291157925ec7af
resolved conflicts for merge of b842629c to honeycomb-plus-aosp

Change-Id: I5628f9e3baad68882b63a2917df3fb0bb1bbdfa6