Merge commit '903be2fc' into fix-merge-conflict
authorAlex Yakavenka <ayakav@codeaurora.org>
Wed, 27 Mar 2013 19:52:47 +0000 (12:52 -0700)
committerWink Saville <wink@google.com>
Wed, 27 Mar 2013 19:59:22 +0000 (12:59 -0700)
commitf16c95f5e7e34e7e3a51a012d172902365a3682e
tree1bd5361b48e3f89b597e5d453f3d2fcebeec932d
parentf8768537438ef0517f6b11f449f9cabbea2f99ba
parent903be2fcd0820071ca6bee5326a796916d516908
Merge commit '903be2fc' into fix-merge-conflict

* commit '903be2fc':
  Telephony: Null check for adncache before search/update.

Change-Id: I1e498b4783e6c3381c14309019420142f3b8b15d
src/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java