OSDN Git Service

resolved conflicts for merge of f0452c25 to master
authorJason Chen <jasonchen@google.com>
Thu, 4 Nov 2010 16:29:55 +0000 (09:29 -0700)
committerJason Chen <jasonchen@google.com>
Thu, 4 Nov 2010 16:29:55 +0000 (09:29 -0700)
commit15d18efddd047406b62d5482356342fccd0f68dc
tree4c110dd108fc151485cb5c8a38dadb3b73f270c8
parentce4b523eb81a07b985ac08973e43d0c7629ff36d
parentf0452c250757f560205da19b02a9172e5d98a71c
resolved conflicts for merge of f0452c25 to master

Change-Id: Ie8f5e81393ac965fd570f99239ab8be8ea0db00c
Android.mk
docs/html/resources/resources_toc.cs