tree 24627d22f066130fcded46fc7b293feaf62740aa
parent f7a338538628bd9090984ddecfb6fd68ea7bb3ba
parent d060328bd09aa3369f4f940d7eb2a08c693839a4
author Andrew Scull <ascull@google.com> 1493911716 +0000
committer android-build-merger <android-build-merger@google.com> 1493911716 +0000

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

Change-Id: I062a4f83ab63076dcb11c56acbc6b5f86157a6b7