| commit | a11d31648469828cac3ab50c583a170ab1096819 | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Aug 27 21:35:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:35:40 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 928145a31bd0b724a065f88f20a8a64fcfbf2a61 [diff] | |
| parent | 68c8852a6ad3e1ad1b652f7dc16a66eb334f9d1a [diff] |
am 68c8852a: am 4b610b4f: (-s ours) am 7f944adb: am 2e728edf: Merge "Bug fix: when linting AndroidManiFest, try look up resource to get the string" into studio-1.3-dev automerge: cdb8443 automerge: 80ba2e7 automerge: ffe8c13 * commit '68c8852a6ad3e1ad1b652f7dc16a66eb334f9d1a':