tree 84f1480cc222b15b4ec9208e0bad863187bb5d12
parent a8f3b3d7747c363445c777f0e3702a54a21d6523
parent ad08c2ca4e3b0c7fa84b687e1aac9bd1c7e106f4
author Android Build Merger (Role) <android-build-merger@google.com> 1501344961 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501344961 +0000

Merge "Merge "Add a missing null check" into oc-dev am: 101fca656d am: d56b01e022" into oc-dr1-dev-plus-aosp