Merge "Avoid NullPointerException"
authorJeff Sharkey <jsharkey@android.com>
Thu, 2 May 2013 16:53:27 +0000 (16:53 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 2 May 2013 16:53:27 +0000 (16:53 +0000)
commit64f6b529963d1ec997cff60a79c9d249e5e09040
treeb5679b2cad75df9c64e621d9ba5f2f946b569662
parent8b9cad519ef72ed4555e9dd32ecee85c922abc32
parentb1bf9a2a0cd929130ee75a29b5f7a9f01901a0d7
Merge "Avoid NullPointerException"