OSDN Git Service

resolved conflicts for merge of f722cecd to honeycomb-plus-aosp
authorScott Main <smain@google.com>
Wed, 16 Feb 2011 20:08:36 +0000 (12:08 -0800)
committerScott Main <smain@google.com>
Wed, 16 Feb 2011 20:08:36 +0000 (12:08 -0800)
commit82170c428615d899a2f40cf74fd80b71b92b2d87
tree2de34eaf949bd30904e7e7343a64fce86fec4561
parent944d50d30d738f510fefef6048e1869fde5c4212
parentea66537c1709ba2c1547e092c0fff6323ce4ce9e
resolved conflicts for merge of f722cecd to honeycomb-plus-aosp

Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f