Merge "Use TCU_CHECK instead of DE_ASSERT am: c578741609 am: 55f1d10c95" into nyc...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 31 May 2016 18:24:28 +0000 (18:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 31 May 2016 18:24:28 +0000 (18:24 +0000)

Trivial merge