am 1dd160cc: am 888699be: am c291ce21: am 55c3a196: Merge "Add to configure for MDC_I...

author Amit Mahajan <amitmahajan@google.com>

Fri, 11 Sep 2015 03:49:47 +0000 (03:49 +0000)

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

Fri, 11 Sep 2015 03:49:47 +0000 (03:49 +0000)
author Amit Mahajan <amitmahajan@google.com>
Fri, 11 Sep 2015 03:49:47 +0000 (03:49 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 11 Sep 2015 03:49:47 +0000 (03:49 +0000)
diff --cc core/res/res/values/config.xml

index b844d44,9e89b24..a5960a9

mode 100755,100644..100644
--- 1/core/res/res/values/config.xml
--- 2/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
diff --cc core/res/res/values/symbols.xml

index de5c592,490d306..16e44b8

mode 100755,100644..100644
--- 1/core/res/res/values/symbols.xml
--- 2/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
author	Amit Mahajan <amitmahajan@google.com>
	Fri, 11 Sep 2015 03:49:47 +0000 (03:49 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 11 Sep 2015 03:49:47 +0000 (03:49 +0000)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history