OSDN Git Service

resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp
authorRobert Ly <robertly@google.com>
Fri, 11 Feb 2011 21:49:09 +0000 (13:49 -0800)
committerRobert Ly <robertly@google.com>
Fri, 11 Feb 2011 21:49:09 +0000 (13:49 -0800)
commit120a181976e7315be61a1a0e052148a43959a87c
tree2de34eaf949bd30904e7e7343a64fce86fec4561
parent7e67e8bdfc904ec465f3a23ca6ed72e8000e5531
parent66194888717a34c71d8cb2a0d31785162c0f2c25
resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp

Conflicts:
docs/html/guide/guide_toc.cs

Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2