tree 6da0e25086337286eef03f4a67087882be7d3db6
parent cf7021e827dde0047bd36d32b734893e98d988fe
parent d295e94dade5123354761c5f2577913799b5b2c5
author Christopher Wiley <wiley@google.com> 1449170918 +0000
committer android-build-merger <android-build-merger@google.com> 1449170918 +0000

Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException" am: 0ded0da517 am: 4ff2cc0898
am: d295e94dad

* commit 'd295e94dade5123354761c5f2577913799b5b2c5':
  Map Errors.h's UNEXPECTED_NULL to NullPointerException