tree 6012c7b0ad42298723519c49d5b161724cde801d
parent 3be4cef3e487b2ab7c4de4df1e572cb0a995f700
parent a2a4f8091ed1a550a8638a84a70457f52a2bf4fb
author Aurimas Liutikas <aurimas@google.com> 1487093194 +0000
committer android-build-merger <android-build-merger@google.com> 1487093194 +0000

Merge "Prevent potential NPE" am: 3b246859eb am: 9b67adec1d
am: a2a4f8091e

Change-Id: I26666c19807955212921b60bc30ea4b809e6d825