Merge "Fix couple of instances of undefined behavior"

author Pyry Haulos <phaulos@google.com>

Fri, 29 May 2015 00:16:20 +0000 (00:16 +0000)

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

Fri, 29 May 2015 00:16:20 +0000 (00:16 +0000)
author Pyry Haulos <phaulos@google.com>
Fri, 29 May 2015 00:16:20 +0000 (00:16 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 29 May 2015 00:16:20 +0000 (00:16 +0000)
diff --cc framework/randomshaders/rsgExpression.cpp
Simple merge
author	Pyry Haulos <phaulos@google.com>
	Fri, 29 May 2015 00:16:20 +0000 (00:16 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 29 May 2015 00:16:20 +0000 (00:16 +0000)