OSDN Git Service

Merge "Replace assert with CHECK from base/logging.h" am: e1fbea9695 am: 3999ebce62
authorJack He <siyuanh@google.com>
Fri, 16 Dec 2016 18:28:53 +0000 (18:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Dec 2016 18:28:53 +0000 (18:28 +0000)
am: 13d1430f60

Change-Id: I854ad1c12f01db6d6f46e3d4dfc3cbb3e36bf928


Trivial merge