tree 9693dbe221feae31d39ce5d08d9249393b4c3707
parent cfe47f49073ab22bddeab6591d045fb523bbad54
parent 3999ebce62d5bc65f6bd21cd5df7b992f845ada7
author Jack He <siyuanh@google.com> 1481912423 +0000
committer android-build-merger <android-build-merger@google.com> 1481912423 +0000

Merge "Replace assert with CHECK from base/logging.h" am: e1fbea9695
am: 3999ebce62

Change-Id: Id3af55906311269145686fc486b49fb92d5a6e63