| commit | 4917c52b5e805d7ed9c3b866797ceba8ac0b81d2 | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Aug 27 21:36:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:36:37 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 8a15ea578a6be6f7f897c6ea400f02b6de97e905 [diff] | |
| parent | f6db13bc18663370f4e8cbf0d1f02e9b650e7cc6 [diff] |
am f6db13bc: am cad348ba: (-s ours) am fa185dfd: am 08fa77b6: Merge "Make lint unit tests run within the IDE" into studio-1.4-dev automerge: cc45ebc automerge: e0f2a13 * commit 'f6db13bc18663370f4e8cbf0d1f02e9b650e7cc6':