tree 5a233ad3dd01bfeb7094d9cdde53ae9a5a088e8f
parent a030efa8c91d5efc91b0e151a4a50158fa9ab394
parent c12499d5c646e79d6a91dddc44c79921d9967c8e
author Caroline Tice <cmtice@google.com> 1479875218 +0000
committer android-build-merger <android-build-merger@google.com> 1479875218 +0000

Merge "Fix null-pointer derefernce warning." am: 955e85294d
am: c12499d5c6

Change-Id: I26217d347ee091d4f39c50be99062ddc3d9ae850