tree 4f5dcb4d37def37cdc9c381336189fe0e39850c1
parent 82a5c4f272fef676c90461ab73d18cd2d0946f60
parent 4847c7f708bdcba64244c2063b6f999fe44f0964
author Daichi Hirono <hirono@google.com> 1495017740 +0000
committer android-build-merger <android-build-merger@google.com> 1495017740 +0000

Merge "Change the CHECK failure into function failure." into oc-dev am: bf6e949727
am: 4847c7f708

Change-Id: Iea6c547dc36ab3910f4100d0dbf60a56201a0107