tree b7b7f1f4841f44cef4a797819ba984b3ee0c2f8f
parent c6239b0d4dfa730c122f2de214dfd2e62f7f8eea
parent 1095908b3474ecee22764ec50200aa6d971d26a9
author Caroline Tice <cmtice@google.com> 1480628125 +0000
committer android-build-merger <android-build-merger@google.com> 1480628125 +0000

Merge "Remove null-ptr deref compiler warning." am: b4d217ed0f
am: 1095908b34

Change-Id: Ie4ee8c1462415b89c96e3a6ade42fa60c6a67a1a