tree 03eb58e3021864dc6f148482a05fe99800c3cfab
parent 5a8e63eb1b24e76fd4a289e86036798546ff58e7
parent 4eaaa4d72fd8438585ab5756b77c303cbfc199bb
author Seigo Nonaka <nona@google.com> 1512786978 +0000
committer android-build-merger <android-build-merger@google.com> 1512786978 +0000

Merge "Switch fatalError to NPE" am: d70e6c1fca am: 37aebe67e3
am: 4eaaa4d72f

Change-Id: I7227c2cdaca158ae6f47315ca112ddf5ea740ee9