tree 976338959e5199a33ba6d8da5875357d208e8f7d
parent fd07232fa4916778aea6c39abf1b68a284274ae7
parent e93c26858d9aec2d4f2649fbc4f782bf4e85b06a
author Adam Stone <blueeyes@google.com> 1525806694 -0700
committer android-build-merger <android-build-merger@google.com> 1525806694 -0700

Merge "Fix an incorrect CHECK in the code." into pi-dev am: d79fe0de75
am: e93c26858d

Change-Id: I5ada3973209a17443fed7f4d8ddb3c1a042aa1c5