| commit | 794dfd96ce28d18be1c3e9dddf8034761705863b | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Aug 27 21:36:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:36:58 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | d491cf882b2ef7092207fb837d9703986fbc074b [diff] | |
| parent | 884a90e5f75f6647c815a212174b0f30457fac3c [diff] |
am 884a90e5: am 3e6acecc: (-s ours) am c686b4be: am c41681f3: Merge "Fixing NPE when getting extra package display name" into studio-1.3-dev automerge: 419eae5 automerge: bab51cb automerge: 558e3fe * commit '884a90e5f75f6647c815a212174b0f30457fac3c':