tree b5679b2cad75df9c64e621d9ba5f2f946b569662
parent 8b9cad519ef72ed4555e9dd32ecee85c922abc32
parent b1bf9a2a0cd929130ee75a29b5f7a9f01901a0d7
author Jeff Sharkey <jsharkey@android.com> 1367513607 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1367513607 +0000

Merge "Avoid NullPointerException"