tree f5e1b1487ab8fef9f242c3c2aff175a47a7abc6d
parent b3614b7285fd0aa2ea385df42eef2d69d37e8c27
parent 1513ff171ae43d141295a235e42d99071e144cdb
author Craig Mautner <cmautner@google.com> 1429818902 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1429818903 +0000

Merge "Fix NPE when load() returns nulls."