tree b82c37f26f89535a53ab4c6d0b4ff7a498803a51
parent 53858ced4cfe4717d90b298e7fb4ffa18effcfcf
parent c0cdfa59473b7f3e225029b72b66c826639858be
author Dianne Hackborn <hackbod@google.com> 1433898387 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433898389 +0000

Merge "Fix NPE." into mnc-dev