tree 59c19d3e24e9f7f55beeb9285643ec6eca96926f
parent 4dd899e194936f42c84bc6da82a6c174f6440ab3
parent 35e3a4db3835608866d9f7f18c49c95aec3228ea
author Walter Jang <wjang@google.com> 1487008302 +0000
committer android-build-merger <android-build-merger@google.com> 1487008302 +0000

Merge "Switch use of Assert outside of tests to Preconditions" am: 8f94b81c67
am: 35e3a4db38

Change-Id: Iee95ce158911aabf289a245be22bdd0a8dbbc500