tree d45a588d4a6ffc078ca10572aa451699486cf822
parent f65b511672a3f5fe36a2447b90bc6d1d89ec5d7a
parent 67b77abfbc9fd8d6ce68f37a52cbb1ef6103d462
author Andrew Scull <ascull@google.com> 1493911085 +0000
committer android-build-merger <android-build-merger@google.com> 1493911085 +0000

Merge "Replace dynamic assertion with a static one."
am: 67b77abfbc

Change-Id: I352b87f078a98cbec379850c6d23a4c460b33460