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)
Conflicts:
docs/html/guide/guide_toc.cs

Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2

1  2 
docs/html/guide/guide_toc.cs

Simple merge