tree 3c5f8efc876131419ae7535b99fd7294bed74403
parent 2a98c97ee6e30e30d9378a1be030a05cab71c109
parent f0046911cfce79f17e1c7853690fedb48e65d751
author Yorke Lee <yorkelee@google.com> 1426120767 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1426120768 +0000

Merge "DO NOT MERGE Fix NPE in Telecom" into lmp-mr1-dev