commit | 671c9d61c4af4455918c6a8238139fb78bf8f780 | [log] [tgz] |
---|---|---|
author | Joe Baker-Malone <jbakermalone@google.com> | Thu Aug 27 12:13:48 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:13:48 2015 +0000 |
tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
parent | 83f6470462e8bae8360e2263bfa9d0b47c0420a1 [diff] | |
parent | c09e123ca2f5ef7891f6da33ba0ba2d66006be1a [diff] |
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 'c09e123ca2f5ef7891f6da33ba0ba2d66006be1a':