| commit | 1920bad48727ed248bdb2a4e607e85e81a7e57ae | [log] [tgz] |
|---|---|---|
| author | Chris Warrington <cmw@google.com> | Thu Aug 27 21:35:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:35:46 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | a11d31648469828cac3ab50c583a170ab1096819 [diff] | |
| parent | db629bf47cf9d56bb6711dee5ed8744394ebdc30 [diff] |
am db629bf4: am ffe5b6cf: (-s ours) am 8d4c5c9f: am e6240e79: Merge "Move lint tests into lint-test." into studio-1.4-dev automerge: ef8cb66 automerge: 82e6090 * commit 'db629bf47cf9d56bb6711dee5ed8744394ebdc30':