Merge "Use TCU_CHECK instead of DE_ASSERT am: c578741609 am: 55f1d10c95" into nyc...
authorSivert Berg <sivert.berg@arm.com>
Tue, 31 May 2016 18:26:46 +0000 (18:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 May 2016 18:26:46 +0000 (18:26 +0000)
am: 11efed9c8d

* commit '11efed9c8d3f9bab79326ef06a229d9130f6b390':

Change-Id: I0cabfb64470b9bec54a94020de992465e22a8c2b


Trivial merge