| commit | 4a455bf833fe92f6ab431813fe60687161c2746f | [log] [tgz] |
|---|---|---|
| author | Michal Bendowski <bendowski@google.com> | Thu Aug 27 21:35:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:35:51 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 05170b6d42baf00a9df87e7c8709439cb045b823 [diff] | |
| parent | d240ddcf334c19195b76bded21b3a98abc189330 [diff] |
am d240ddcf: am 454ea50d: (-s ours) am 95c4b143: am ae917440: Merge "Check for /tmp/foo in SdkUtilsTest." into studio-1.4-dev automerge: 438424a automerge: 7d2d36f * commit 'd240ddcf334c19195b76bded21b3a98abc189330':