| commit | 7de4fc3d0e8d5f7f4c539b7043afe20453f384ea | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Aug 27 21:36:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:36:30 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 7899f7fc65cf765fa1ad2cc7670f33691725d7a5 [diff] | |
| parent | 2516074b2ecc96b0e741e0c5c50574e24a8768b6 [diff] |
am 2516074b: am 40ac1257: (-s ours) am d2deac14: am 35c84666: Merge "180417: Code inspection does not work when a Lint spelling error occurs" into studio-1.4-dev automerge: 3e48358 automerge: 8107ce2 * commit '2516074b2ecc96b0e741e0c5c50574e24a8768b6':