| commit | 928145a31bd0b724a065f88f20a8a64fcfbf2a61 | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Aug 27 21:35:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:35:36 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 1c82fc713d150f5ae0abff0ac6a6571fe226f9b9 [diff] | |
| parent | 5fb0e26efd1c3120077ca706a2c48ef881204052 [diff] |
am 5fb0e26e: am a161b240: (-s ours) am c467744a: am e2f23ff6: Merge "Bug fix: when linting AndroidManiFest, try look up resource to get the string" into studio-1.4-dev automerge: 4f21375 automerge: a5bfb17 * commit '5fb0e26efd1c3120077ca706a2c48ef881204052':