tree f3bf9b2a4c8f30e7ecd8606fc260e30b5b16a8b4
parent 2446e5dfefe08c95c959487c5f491caea06c2973
parent d70e6c1fca13abae80c4e1d888d93405e5ae54d4
author Seigo Nonaka <nona@google.com> 1512786255 +0000
committer android-build-merger <android-build-merger@google.com> 1512786255 +0000

Merge "Switch fatalError to NPE"
am: d70e6c1fca

Change-Id: I15f2d9a4d7b59fb980e50a68a00b5673c826e694