commit | 0bd50b5f07b1d556245723e8e1cf13f65a187f3d | [log] [tgz] |
---|---|---|
author | Joe Baker-Malone <jbakermalone@google.com> | Thu Aug 27 21:36:11 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:36:11 2015 +0000 |
tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
parent | f9c6be3125adc889fb5e0ee84790372601fcf937 [diff] | |
parent | 671c9d61c4af4455918c6a8238139fb78bf8f780 [diff] |
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':