am 8fdd4a0b: am 7db3e8a5: am 9890fe24: am c3921656: Add templates support for dynamic...

author Dirk Dougherty <ddougherty@google.com>

Wed, 14 May 2014 21:09:39 +0000 (21:09 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 14 May 2014 21:09:39 +0000 (21:09 +0000)
author Dirk Dougherty <ddougherty@google.com>
Wed, 14 May 2014 21:09:39 +0000 (21:09 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 14 May 2014 21:09:39 +0000 (21:09 +0000)
diff --cc tools/droiddoc/templates-sdk/customizations.cs
Simple merge
diff --cc tools/droiddoc/templates-sdk/head_tag.cs
Simple merge
author	Dirk Dougherty <ddougherty@google.com>
	Wed, 14 May 2014 21:09:39 +0000 (21:09 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 14 May 2014 21:09:39 +0000 (21:09 +0000)
		1	2
tools/droiddoc/templates-sdk/customizations.cs	patch \|	diff1 \|	diff2 \|	blob \| history
tools/droiddoc/templates-sdk/head_tag.cs	patch \|	diff1 \|	diff2 \|	blob \| history