tree d7c52ce037a9c67a4cfc863d7b76c8e8044b4005
parent 4eaaa4d72fd8438585ab5756b77c303cbfc199bb
parent 9dd0fb2999d5328c1001765268804e056dbc9210
author Nicolas Geoffray <ngeoffray@google.com> 1512824160 +0000
committer android-build-merger <android-build-merger@google.com> 1512824160 +0000

Merge "Revert "Switch fatalError to NPE"" am: 3c76c9ae05
am: 9dd0fb2999

Change-Id: I576b448b5b1e778caf27078fe1f6167aebc9de08