Merge "Track libcore Executable.getParameter() changes"

author Neil Fuller <nfuller@google.com>

Tue, 13 Sep 2016 09:02:35 +0000 (09:02 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Tue, 13 Sep 2016 09:02:35 +0000 (09:02 +0000)
author Neil Fuller <nfuller@google.com>
Tue, 13 Sep 2016 09:02:35 +0000 (09:02 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 13 Sep 2016 09:02:35 +0000 (09:02 +0000)
diff --cc runtime/Android.bp
Simple merge
diff --cc runtime/runtime.cc
Simple merge
author	Neil Fuller <nfuller@google.com>
	Tue, 13 Sep 2016 09:02:35 +0000 (09:02 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 13 Sep 2016 09:02:35 +0000 (09:02 +0000)
		1	2
runtime/Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/runtime.cc	patch \|	diff1 \|	diff2 \|	blob \| history