Merge "Rebuild odex files in PDK fusion build." into nyc-dev

author Ying Wang <wangying@google.com>

Tue, 15 Mar 2016 21:23:49 +0000 (21:23 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 15 Mar 2016 21:23:50 +0000 (21:23 +0000)
author Ying Wang <wangying@google.com>
Tue, 15 Mar 2016 21:23:49 +0000 (21:23 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 15 Mar 2016 21:23:50 +0000 (21:23 +0000)
diff --cc core/Makefile
Simple merge
diff --cc core/dex_preopt_libart.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Tue, 15 Mar 2016 21:23:49 +0000 (21:23 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 15 Mar 2016 21:23:50 +0000 (21:23 +0000)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
core/dex_preopt_libart.mk	patch \|	diff1 \|	diff2 \|	blob \| history