OSDN Git Service

resolved conflicts for merge 7bc0fb1b to honeycomb-plus-aosp
authorScott Main <smain@google.com>
Tue, 18 Jan 2011 03:56:23 +0000 (19:56 -0800)
committerScott Main <smain@google.com>
Tue, 18 Jan 2011 03:56:23 +0000 (19:56 -0800)
commit73f2e196dbfc81a9d3cf9d49bda72277374586c2
tree8821c268a79f4284075766aaab23ac296bfd3e37
parentfd5aca8bb196e24b8b9c8189e2389f4f9087f804
parent7bc0fb1b32548dad690c4acc2bd1e9165333dbae
resolved conflicts for merge 7bc0fb1b to honeycomb-plus-aosp

Change-Id: I32563b59c552a0ad3b07f300e3a1e450bd03826c