Merge "Remove a few preprocessor cases testing undefined behavior" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Wed, 19 Oct 2016 18:13:06 +0000 (18:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Oct 2016 18:13:06 +0000 (18:13 +0000)
am: 4275d2099c

Change-Id: I6dddd9f4d9f8223e6a639266cc9d2a3afe800598


Trivial merge