tree ff5bf30242ff444d41cfeb257d4914bb38905b2e
parent f9c6be3125adc889fb5e0ee84790372601fcf937
parent 671c9d61c4af4455918c6a8238139fb78bf8f780
author Joe Baker-Malone <jbakermalone@google.com> 1440711371 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440711371 +0000

am 671c9d61: am c09e123c: (-s ours) am 4a5fbd14: am bc0dec1c: Merge "Fixing NPE when getting extra package display name" into studio-1.4-dev automerge: cdfb324 automerge: 19daa38

* commit '671c9d61c4af4455918c6a8238139fb78bf8f780':